Skip to content

Commit 5cf4aa7

Browse files
Build QAxWidget specific stuff only on Windows
1 parent 616e50c commit 5cf4aa7

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

demo/MainWindow.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@
5353
#include <QRubberBand>
5454
#include <QPlainTextEdit>
5555
#include <QTableWidget>
56+
57+
#ifdef Q_OS_WIN
5658
#include <QAxWidget>
59+
#endif
5760

5861
#include <QMap>
5962
#include <QElapsedTimer>
@@ -201,6 +204,7 @@ static ads::CDockWidget* createTableWidget(QMenu* ViewMenu)
201204
}
202205

203206

207+
#ifdef Q_OS_WIN
204208
//============================================================================
205209
static ads::CDockWidget* createActiveXWidget(QMenu* ViewMenu, QWidget* parent = nullptr)
206210
{
@@ -211,6 +215,7 @@ static ads::CDockWidget* createActiveXWidget(QMenu* ViewMenu, QWidget* parent =
211215
ViewMenu->addAction(DockWidget->toggleViewAction());
212216
return DockWidget;
213217
}
218+
#endif
214219

215220

216221
//============================================================================
@@ -298,7 +303,9 @@ void MainWindowPrivate::createContent()
298303
auto Action = ui.menuView->addAction(QString("Set %1 floating").arg(DockWidget->windowTitle()));
299304
DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating()));
300305

306+
#ifdef Q_OS_WIN
301307
DockManager->addDockWidgetFloating(createActiveXWidget(ViewMenu));
308+
#endif
302309

303310
for (auto DockWidget : DockManager->dockWidgetsMap())
304311
{

demo/demo.pro

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

33
TARGET = AdvancedDockingSystemDemo
44
DESTDIR = $${ADS_OUT_ROOT}/lib
5-
QT += core gui widgets axcontainer
5+
QT += core gui widgets
6+
7+
win32 {
8+
QT += axcontainer
9+
}
10+
611
CONFIG += c++14
712
CONFIG += debug_and_release
813
DEFINES += QT_DEPRECATED_WARNINGS

0 commit comments

Comments
 (0)