summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-10-22 07:47:06 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-10-22 07:47:06 (GMT)
commit9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (patch)
treeec1eb5ec4225b596dca92df654d58b72a229d8a6 /src/testlib
parentd22741b4bee0e526aefbbd7b851c2aa1b0b1c5b6 (diff)
parent4e6790c8dc21c5287bff6799fb0984a72e2f2766 (diff)
downloadQt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.zip
Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.gz
Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.bz2
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/testlib.pro10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index a8186d8..c25d23d 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -70,8 +70,16 @@ wince*::LIBS += libcmt.lib \
coredll.lib \
winsock.lib
mac:LIBS += -framework IOKit \
- -framework ApplicationServices \
-framework Security
+!qpa:mac: LIBS += -framework ApplicationServices
+qpa:mac: {
+ contains(QT_CONFIG, coreservices) {
+ LIBS_PRIVATE += -framework CoreServices
+ } else {
+ LIBS_PRIVATE += -framework CoreFoundation
+ }
+}
+
include(../qbase.pri)
QMAKE_TARGET_PRODUCT = QTestLib
QMAKE_TARGET_DESCRIPTION = Qt \