mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-01 02:42:39 +08:00
Code

Build QAxWidget specific stuff only on Windows

Browse Source
This commit is contained in:
Uwe Kindler 2020-01-11 12:05:44 +01:00
parent 616e50c3f5
commit 5cf4aa77d8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demo/MainWindow.cpp
View File

@ -53,7 +53,10 @@
#include <QRubberBand> #include <QRubberBand>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QTableWidget> #include <QTableWidget>
#ifdef Q_OS_WIN
#include <QAxWidget> #include <QAxWidget>
#endif
#include <QMap> #include <QMap>
#include <QElapsedTimer> #include <QElapsedTimer>
@ -201,6 +204,7 @@ static ads::CDockWidget* createTableWidget(QMenu* ViewMenu)
} }
#ifdef Q_OS_WIN
//============================================================================ //============================================================================
static ads::CDockWidget* createActiveXWidget(QMenu* ViewMenu, QWidget* parent = nullptr) 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()); ViewMenu->addAction(DockWidget->toggleViewAction());
return DockWidget; return DockWidget;
} }
#endif
//============================================================================ //============================================================================
@ -298,7 +303,9 @@ void MainWindowPrivate::createContent()
auto Action = ui.menuView->addAction(QString("Set %1 floating").arg(DockWidget->windowTitle())); auto Action = ui.menuView->addAction(QString("Set %1 floating").arg(DockWidget->windowTitle()));
DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating())); DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating()));
#ifdef Q_OS_WIN
DockManager->addDockWidgetFloating(createActiveXWidget(ViewMenu)); DockManager->addDockWidgetFloating(createActiveXWidget(ViewMenu));
#endif
for (auto DockWidget : DockManager->dockWidgetsMap()) for (auto DockWidget : DockManager->dockWidgetsMap())
{ {

7
demo/demo.pro
View File

@ -2,7 +2,12 @@ ADS_OUT_ROOT = $${OUT_PWD}/..
TARGET = AdvancedDockingSystemDemo TARGET = AdvancedDockingSystemDemo
DESTDIR = $${ADS_OUT_ROOT}/lib DESTDIR = $${ADS_OUT_ROOT}/lib
QT += core gui widgets axcontainer QT += core gui widgets
win32 {
QT += axcontainer
}
CONFIG += c++14 CONFIG += c++14
CONFIG += debug_and_release CONFIG += debug_and_release
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS