Properly detect Qt 6

It doesn't compile yet on Qt 6 but I'm working on it.
This commit is contained in:
Rodrigo Torres
2021-08-20 13:50:06 -03:00
parent b9a3b3cce4
commit 53683a8c89
3 changed files with 35 additions and 32 deletions

View File

@@ -3,21 +3,23 @@ include($$PWD/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri)
INCLUDEPATH *= $$PWD/3rdparty/designer
greaterThan(QT_MAJOR_VERSION, 4) : contains(QT, uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION
equals(QT_MAJOR_VERSION, 4) : CONFIG(uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION
}
lessThan(QT_MAJOR_VERSION, 5) : CONFIG(uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION
if(equals(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 6)) : contains(QT, uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION
}
greaterThan(QT_MAJOR_VERSION, 4) {
QT *= designer designercomponents-private
} else {
equals(QT_MAJOR_VERSION, 4) {
CONFIG *= designer
qtAddLibrary(QtDesignerComponents)
}
equals(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 6) {
QT *= designer designercomponents-private
}
SOURCES += $$PWD/lrdialogdesigner.cpp
HEADERS += $$PWD/lrdialogdesigner.h