From f98ff4794f03cdd1e6aa46b3803b81e7407daeb8 Mon Sep 17 00:00:00 2001 From: Philipp Swoboda Date: Sun, 12 Feb 2023 19:41:57 +0100 Subject: [PATCH] Add branch for Version 1.5 (because it seems to work better than newer versions) --- CMakeLists.txt | 4 ++++ src/MainWindow.cpp | 7 +++++++ src/MainWindow.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d81436ff..7ff335a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,10 @@ option(${PROJECT_NAME}_WERROR "Use -Werror (will be true for developer-mode unco option(${PROJECT_NAME}_X11EXTRAS "On Linux, link against QtX11Extras so we can detect if the compositor supports transparency. Not applicable to other platforms or Qt6." ON) option(${PROJECT_NAME}_XLib "On Linux, link against XLib, for a more robust window z-order detection." OFF) +set(${PROJECT_NAME}_QT6 ON) +set(${PROJECT_NAME}_X11EXTRAS OFF) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") 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 5a6574a4..c439319a 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -106,6 +106,12 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options, d->m_layout->addWidget(layoutWidget()); } + +} + + +void MainWindow::postInit(QWidget *parent, Qt::WindowFlags flags) +{ setCentralWidget(d->m_centralWidget); create(); @@ -116,6 +122,7 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options, }); } + MainWindow::~MainWindow() { delete d; diff --git a/src/MainWindow.h b/src/MainWindow.h index db904392..9df31984 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -44,6 +44,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;