Compare commits

...

1 Commits

Author SHA1 Message Date
ff4d97d5ac Make adaptions for LabMCT under v1.7 2023-06-19 13:10:51 +02:00
3 changed files with 11 additions and 3 deletions

View File

@@ -98,18 +98,18 @@ set(${PROJECT_NAME}_SOVERSION "1.7")
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}_PYTHON_BINDINGS "Build python bindings" OFF)
option(${PROJECT_NAME}_QTQUICK "Build for QtQuick instead of QtWidgets" OFF)
option(${PROJECT_NAME}_STATIC "Build statically" OFF)
option(${PROJECT_NAME}_TESTS "Build the tests" OFF)
option(${PROJECT_NAME}_EXAMPLES "Build the examples" ON)
option(${PROJECT_NAME}_EXAMPLES "Build the examples" OFF)
option(${PROJECT_NAME}_DOCS "Build the API documentation" OFF)
option(${PROJECT_NAME}_WERROR "Use -Werror (will be true for developer-mode unconditionally)" OFF)
option(${PROJECT_NAME}_X11EXTRAS
"Link with QtX11Extras to detect if the compositor supports transparency. Not applicable to non-Linux or Qt6."
ON
OFF
)
option(${PROJECT_NAME}_XLib "On Linux, link against XLib, for a more robust window z-order detection." OFF)

View File

@@ -106,6 +106,11 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options,
d->m_layout->addWidget(layoutWidget());
}
}
void MainWindow::postInit(QWidget *parent, Qt::WindowFlags flags)
{
setCentralWidget(d->m_centralWidget);
const bool isWindow = !parent || (flags & Qt::Window);

View File

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