diff options
Diffstat (limited to 'installerfw.pri')
-rw-r--r-- | installerfw.pri | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/installerfw.pri b/installerfw.pri index 7fd607bac..9b969e4ee 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,13 +3,14 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION_STR = 5.0.0 -IFW_VERSION = 0x050000 -IFW_VERSION_WIN32 = 5,0,0,0 +IFW_VERSION_STR = 4.8.0 +IFW_VERSION = 0x040800 +IFW_VERSION_WIN32 = 4,8,0,0 IFW_VERSION_STR_WIN32 = $$IFW_VERSION_STR\0 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 +IFW_CACHE_FORMAT_VERSION = 1.2.0 IFW_NEWLINE = $$escape_expand(\\n\\t) isEmpty(IFW_DISABLE_TRANSLATIONS): IFW_DISABLE_TRANSLATIONS = $$(IFW_DISABLE_TRANSLATIONS) @@ -97,6 +98,15 @@ win32 { LCONVERT = $${LCONVERT}.exe QMAKE_BINARY = $${QMAKE_BINARY}.exe } + +#6.6.0 rcc has been moved to libexec in linux/mac and the RCC variable no longer +#points to correct location +!exists($$RCC) { + RCC = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_LIBEXECS]/rcc)) +} +!exists($$RCC) { + warning("Resource compiler '$$RCC' not found.") +} win32-g++*:QMAKE_CXXFLAGS += -Wno-attributes macx:QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden @@ -136,10 +146,17 @@ macx:LIBS += -framework Carbon -framework Security QT += uitools core-private CONFIG(static, static|shared) { - win32:QT += winextras + win32:lessThan(QT_MAJOR_VERSION, 6):QT += winextras QT += concurrent network qml xml + greaterThan(QT_MAJOR_VERSION, 5):QT += core5compat } -CONFIG += depend_includepath no_private_qt_headers_warning c++11 +CONFIG += depend_includepath no_private_qt_headers_warning +versionAtLeast(QT_MAJOR_VERSION, 6) { + CONFIG+=c++17 +} else { + CONFIG+=c++11 +} + win32:CONFIG += console exists(".git") { @@ -157,7 +174,8 @@ DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUIL IFW_VERSION=$$IFW_VERSION \ IFW_VERSION_STR_WIN32=$$IFW_VERSION_STR_WIN32 \ IFW_VERSION_WIN32=$$IFW_VERSION_WIN32 -DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION +DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION \ + IFW_CACHE_FORMAT_VERSION=$$IFW_CACHE_FORMAT_VERSION win32-g++*: LIBS += -lmpr -luuid @@ -171,7 +189,7 @@ CONFIG(libarchive):equals(TEMPLATE, app) { LIBS += -llibarchive !isEmpty(IFW_ZLIB_LIBRARY) { LIBS += $$IFW_ZLIB_LIBRARY - } else { + } else:!contains(QT_MODULES, zlib) { unix:LIBS += -lz win32:LIBS += -lzlib } |