diff options
| author | kh1 <karsten.heimrich@digia.com> | 2012-11-21 16:34:53 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-11-21 17:53:20 +0100 |
| commit | 541399200a32580ef8d29af15cceae689ad1ce56 (patch) | |
| tree | 9ece2f79d5d99cfa478a1495032fa6ba149ee97b /installerfw.pri | |
| parent | ad57af73451c1db60a39d7f5f75a8d6530f138ff (diff) | |
Adjust to make it build with Qt5.
Change-Id: I697b6987da45d1afe7620e2114fd2d4bcf15c7ce
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/installerfw.pri b/installerfw.pri index 83b35f085..5ca3f144e 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -53,22 +53,21 @@ macx:LIBS += -framework Carbon -framework Security isEqual(QT_MAJOR_VERSION, 4) { CONFIG += uitools + CONFIG(static, static|shared) { + DEFINES += QT_STATIC + QT += script network xml + } } else { - QT += uitools + QT += uitools xml contains(QT, gui): QT += widgets - contains(QT, core): QT += concurrent + contains(QT, core): QT += concurrent core-private } CONFIG += depend_includepath -CONFIG(static, static|shared) { - QT += script network xml -} GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1" -CONFIG(shared, static|shared):DEFINES += KDTOOLS_SHARED -CONFIG(shared, static|shared):DEFINES += LIB_INSTALLER_SHARED static { win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib |