diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp index 10f3317..48c4b23 100644 --- a/demo/MainWindow.cpp +++ b/demo/MainWindow.cpp @@ -53,7 +53,10 @@ #include #include #include + +#ifdef Q_OS_WIN #include +#endif #include #include @@ -201,6 +204,7 @@ static ads::CDockWidget* createTableWidget(QMenu* ViewMenu) } +#ifdef Q_OS_WIN //============================================================================ static ads::CDockWidget* createActiveXWidget(QMenu* ViewMenu, QWidget* parent = nullptr) { @@ -211,6 +215,7 @@ static ads::CDockWidget* createActiveXWidget(QMenu* ViewMenu, QWidget* parent = ViewMenu->addAction(DockWidget->toggleViewAction()); return DockWidget; } +#endif //============================================================================ @@ -298,7 +303,9 @@ void MainWindowPrivate::createContent() auto Action = ui.menuView->addAction(QString("Set %1 floating").arg(DockWidget->windowTitle())); DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating())); +#ifdef Q_OS_WIN DockManager->addDockWidgetFloating(createActiveXWidget(ViewMenu)); +#endif for (auto DockWidget : DockManager->dockWidgetsMap()) { diff --git a/demo/demo.pro b/demo/demo.pro index aeba607..57ff0a5 100644 --- a/demo/demo.pro +++ b/demo/demo.pro @@ -2,7 +2,12 @@ ADS_OUT_ROOT = $${OUT_PWD}/.. TARGET = AdvancedDockingSystemDemo DESTDIR = $${ADS_OUT_ROOT}/lib -QT += core gui widgets axcontainer +QT += core gui widgets + +win32 { +QT += axcontainer +} + CONFIG += c++14 CONFIG += debug_and_release DEFINES += QT_DEPRECATED_WARNINGS