mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2025-03-31 10:22:39 +08:00
Added QQuickWidget to demo application for testing OpenGl QtQuick on Linux
This commit is contained in:
parent
09e4e6fa5a
commit
5a00eece87
@ -62,6 +62,7 @@
|
|||||||
#include <QPointer>
|
#include <QPointer>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <QElapsedTimer>
|
#include <QElapsedTimer>
|
||||||
|
#include <QQuickWidget>
|
||||||
|
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
|
||||||
@ -407,6 +408,17 @@ struct MainWindowPrivate
|
|||||||
return DockWidget;
|
return DockWidget;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create QQuickWidget for test for OpenGL and QQuick
|
||||||
|
*/
|
||||||
|
ads::CDockWidget *createQQuickWidget()
|
||||||
|
{
|
||||||
|
QQuickWidget *widget = new QQuickWidget();
|
||||||
|
ads::CDockWidget *dockWidget = new ads::CDockWidget("Quick");
|
||||||
|
dockWidget->setWidget(widget);
|
||||||
|
return dockWidget;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||||
@ -424,7 +436,6 @@ struct MainWindowPrivate
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
@ -557,6 +568,11 @@ void MainWindowPrivate::createContent()
|
|||||||
// Create image viewer
|
// Create image viewer
|
||||||
DockWidget = createImageViewer();
|
DockWidget = createImageViewer();
|
||||||
DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
|
DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
|
||||||
|
|
||||||
|
// Create quick widget
|
||||||
|
DockWidget = createQQuickWidget();
|
||||||
|
DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, true);
|
||||||
|
DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ ADS_OUT_ROOT = $${OUT_PWD}/..
|
|||||||
|
|
||||||
TARGET = AdvancedDockingSystemDemo
|
TARGET = AdvancedDockingSystemDemo
|
||||||
DESTDIR = $${ADS_OUT_ROOT}/lib
|
DESTDIR = $${ADS_OUT_ROOT}/lib
|
||||||
QT += core gui widgets
|
QT += core gui widgets quick quickwidgets
|
||||||
|
|
||||||
include(../ads.pri)
|
include(../ads.pri)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user