From 7a7c03793c1855b30ae2946b7ce8db0b8b9a8c4f Mon Sep 17 00:00:00 2001 From: Philipp Swoboda Date: Sun, 12 Feb 2023 18:49:05 +0100 Subject: [PATCH] Switched back to version 1.6 because of disapearing icons --- CMakeLists.txt | 5 +++++ src/MainWindow.cpp | 3 +++ src/MainWindow.h | 2 ++ 3 files changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a116c8f..70a63991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) +# 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/KDAB/modules") diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index a4ba1d52..3853d8c0 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -105,7 +105,10 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options, } else { d->m_layout->addWidget(layoutWidget()); } +} +void MainWindow::postInit(QWidget *parent, Qt::WindowFlags flags) +{ setCentralWidget(d->m_centralWidget); const bool isWindow = !parent || (flags & Qt::Window); diff --git a/src/MainWindow.h b/src/MainWindow.h index a9d74b55..0d15c36e 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -48,6 +48,8 @@ public: explicit MainWindow(const QString &uniqueName, MainWindowOptions options = MainWindowOption_None, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); + void postInit(QWidget *parent, Qt::WindowFlags flags = Qt::WindowFlags()); + ///@brief Destructor ~MainWindow() override;