Skip to content

Commit 5a00eec

Browse files
Added QQuickWidget to demo application for testing OpenGl QtQuick on Linux
1 parent 09e4e6f commit 5a00eec

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

demo/MainWindow.cpp

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
#include <QPointer>
6363
#include <QMap>
6464
#include <QElapsedTimer>
65+
#include <QQuickWidget>
6566

6667

6768
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
@@ -407,6 +408,17 @@ struct MainWindowPrivate
407408
return DockWidget;
408409
}
409410

411+
/**
412+
* Create QQuickWidget for test for OpenGL and QQuick
413+
*/
414+
ads::CDockWidget *createQQuickWidget()
415+
{
416+
QQuickWidget *widget = new QQuickWidget();
417+
ads::CDockWidget *dockWidget = new ads::CDockWidget("Quick");
418+
dockWidget->setWidget(widget);
419+
return dockWidget;
420+
}
421+
410422

411423
#ifdef Q_OS_WIN
412424
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
@@ -424,7 +436,6 @@ struct MainWindowPrivate
424436
}
425437
#endif
426438
#endif
427-
428439
};
429440

430441
//============================================================================
@@ -557,6 +568,11 @@ void MainWindowPrivate::createContent()
557568
// Create image viewer
558569
DockWidget = createImageViewer();
559570
DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
571+
572+
// Create quick widget
573+
DockWidget = createQQuickWidget();
574+
DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, true);
575+
DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
560576
}
561577

562578

demo/demo.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ADS_OUT_ROOT = $${OUT_PWD}/..
22

33
TARGET = AdvancedDockingSystemDemo
44
DESTDIR = $${ADS_OUT_ROOT}/lib
5-
QT += core gui widgets
5+
QT += core gui widgets quick quickwidgets
66

77
include(../ads.pri)
88

0 commit comments

Comments
 (0)