Compare commits

...

2 Commits

Author SHA1 Message Date
Philipp Swoboda
e310df8e16 Always build against Qt6 2023-06-17 15:40:37 +02:00
Philipp Swoboda
f98ff4794f Add branch for Version 1.5 (because it seems to work better than newer versions) 2023-02-12 19:41:57 +01:00
3 changed files with 14 additions and 1 deletions

View File

@@ -97,7 +97,7 @@ set(${PROJECT_NAME}_SOVERSION "1.5")
include(FeatureSummary) include(FeatureSummary)
option(${PROJECT_NAME}_QT6 "Build against Qt 6" OFF) option(${PROJECT_NAME}_QT6 "Build against Qt 6" ON)
option(${PROJECT_NAME}_DEVELOPER_MODE "Developer Mode" OFF) option(${PROJECT_NAME}_DEVELOPER_MODE "Developer Mode" OFF)
option(${PROJECT_NAME}_PYTHON_BINDINGS "Build python bindings" OFF) option(${PROJECT_NAME}_PYTHON_BINDINGS "Build python bindings" OFF)
option(${PROJECT_NAME}_QTQUICK "Build for QtQuick instead of QtWidgets" OFF) option(${PROJECT_NAME}_QTQUICK "Build for QtQuick instead of QtWidgets" OFF)
@@ -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}_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) 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")
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")

View File

@@ -106,6 +106,12 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options,
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);
create(); create();
@@ -116,6 +122,7 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options,
}); });
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
delete d; delete d;

View File

@@ -44,6 +44,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;