mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 00:33:02 +03:00
Properly detect Qt 6
It doesn't compile yet on Qt 6 but I'm working on it.
This commit is contained in:
parent
b9a3b3cce4
commit
53683a8c89
47
common.pri
47
common.pri
@ -33,23 +33,24 @@ CONFIG(easy_profiler) {
|
||||
INCLUDEPATH *= $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
|
||||
DEPENDPATH *= $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
|
||||
unix|win32: LIBS *= -L$$PWD/3rdparty/easyprofiler/build/bin/ -leasy_profiler
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
equals(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 6) {
|
||||
DEFINES *= BUILD_WITH_EASY_PROFILER
|
||||
}
|
||||
}
|
||||
|
||||
!CONFIG(qtscriptengine) {
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
greaterThan(QT_MINOR_VERSION, 5) {
|
||||
CONFIG *= qjsengine
|
||||
}
|
||||
lessThan(QT_MINOR_VERSION, 6) {
|
||||
CONFIG *= qtscriptengine
|
||||
}
|
||||
}
|
||||
lessThan(QT_MAJOR_VERSION, 5) {
|
||||
equals(QT_MAJOR_VERSION, 4) {
|
||||
CONFIG *= qtscriptengine
|
||||
}
|
||||
equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 6) {
|
||||
CONFIG *= qtscriptengine
|
||||
}
|
||||
equals(QT_MAJOR_VERSION, 5) : greaterThan(QT_MINOR_VERSION, 5) {
|
||||
CONFIG *= qjsengine
|
||||
}
|
||||
equals(QT_MAJOR_VERSION, 6) {
|
||||
CONFIG *= qjsengine
|
||||
}
|
||||
}
|
||||
|
||||
CONFIG(qtscriptengine) {
|
||||
@ -74,12 +75,12 @@ CONFIG(zint) {
|
||||
DEFINES *= HAVE_ZINT
|
||||
}
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
QT *= uitools
|
||||
equals(QT_MAJOR_VERSION, 4) {
|
||||
CONFIG *= uitools
|
||||
}
|
||||
|
||||
lessThan(QT_MAJOR_VERSION, 5) {
|
||||
CONFIG *= uitools
|
||||
equals(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 6) {
|
||||
QT *= uitools
|
||||
}
|
||||
|
||||
CONFIG(release, debug|release) {
|
||||
@ -150,7 +151,15 @@ QT *= xml sql
|
||||
REPORT_PATH = $$PWD/limereport
|
||||
TRANSLATIONS_PATH = $$PWD/translations
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
equals(QT_MAJOR_VERSION, 4) {
|
||||
DEFINES *= HAVE_QT4
|
||||
CONFIG(uitools) {
|
||||
message(uitools)
|
||||
DEFINES *= HAVE_UI_LOADER
|
||||
}
|
||||
}
|
||||
|
||||
equals(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 6) {
|
||||
DEFINES *= HAVE_QT5
|
||||
QT *= printsupport widgets
|
||||
contains(QT, uitools) {
|
||||
@ -163,11 +172,3 @@ greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
QT *= qml
|
||||
}
|
||||
}
|
||||
|
||||
lessThan(QT_MAJOR_VERSION, 5) {
|
||||
DEFINES *= HAVE_QT4
|
||||
CONFIG(uitools) {
|
||||
message(uitools)
|
||||
DEFINES *= HAVE_UI_LOADER
|
||||
}
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ SUBDIRS += \
|
||||
demo_r2 \
|
||||
designer
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 1) {
|
||||
if(equals(QT_MAJOR_VERSION, 5) : greaterThan(QT_MINOR_VERSION, 1)) | equals(QT_MAJOR_VERSION, 6) {
|
||||
SUBDIRS += console
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user