diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-21 17:04:03 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-21 17:04:32 +0100 |
commit | 3d9fc71e899702fff6124351cf0d5b1fa0c07b41 (patch) | |
tree | a9b8eb1ca5fd45c7f9ffb4a92588e2fa6a294443 /installerfw.pri | |
parent | 7e9b2651d0bba127ab8197ffa1ddbd5805a211d2 (diff) | |
parent | 3fb931187386aadd4329e763b8a276ee0bc5ab77 (diff) |
Merge remote-tracking branch 'origin/1.3'
Change-Id: Ibe38be81d8e763fb58899e2594641b8b062c5504
Diffstat (limited to 'installerfw.pri')
-rw-r--r-- | installerfw.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/installerfw.pri b/installerfw.pri index af78081e5..c5b4a8b4a 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -82,12 +82,14 @@ macx:LIBS += -framework Carbon -framework Security isEqual(QT_MAJOR_VERSION, 4) { CONFIG += uitools CONFIG(static, static|shared) { + QTPLUGIN += qico DEFINES += QT_STATIC QT += script network xml } } else { QT += uitools core-private CONFIG(static, static|shared) { + QTPLUGIN += qico QT += concurrent network script xml } } |