Compare commits
1 Commits
bugrepro/q
...
LabMCT
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7a7c03793c |
@@ -118,6 +118,11 @@ option(${PROJECT_NAME}_X11EXTRAS
|
|||||||
)
|
)
|
||||||
option(${PROJECT_NAME}_XLib "On Linux, link against XLib, for a more robust window z-order detection." OFF)
|
option(${PROJECT_NAME}_XLib "On Linux, link against XLib, for a more robust window z-order detection." OFF)
|
||||||
|
|
||||||
|
# changed by Philipp Swoboda, philipp@swoboda.xyz
|
||||||
|
# set QT6 as default option and switch X11 Extra off
|
||||||
|
set(${PROJECT_NAME}_X11EXTRA OFF)
|
||||||
|
set(${PROJECT_NAME}_QT6 ON)
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/ECM/modules")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/ECM/modules")
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/KDAB/modules")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/KDAB/modules")
|
||||||
|
|
||||||
|
|||||||
@@ -105,7 +105,10 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options,
|
|||||||
} else {
|
} else {
|
||||||
d->m_layout->addWidget(layoutWidget());
|
d->m_layout->addWidget(layoutWidget());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::postInit(QWidget *parent, Qt::WindowFlags flags)
|
||||||
|
{
|
||||||
setCentralWidget(d->m_centralWidget);
|
setCentralWidget(d->m_centralWidget);
|
||||||
|
|
||||||
const bool isWindow = !parent || (flags & Qt::Window);
|
const bool isWindow = !parent || (flags & Qt::Window);
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ public:
|
|||||||
explicit MainWindow(const QString &uniqueName, MainWindowOptions options = MainWindowOption_None,
|
explicit MainWindow(const QString &uniqueName, MainWindowOptions options = MainWindowOption_None,
|
||||||
QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
|
QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
|
||||||
|
|
||||||
|
void postInit(QWidget *parent, Qt::WindowFlags flags = Qt::WindowFlags());
|
||||||
|
|
||||||
///@brief Destructor
|
///@brief Destructor
|
||||||
~MainWindow() override;
|
~MainWindow() override;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user