blob: 27f9356a559ffe61bea3aa9a4a8818187bd3717a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From cfbfb7c44eed90c3d6bb0edd8af3ab534e1410b3 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Tue, 25 Jan 2011 14:48:39 +0100
Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.
---
qtbase/mkspecs/features/qt_functions.prf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf
index c44419c..b16c848 100644
--- a/qtbase/mkspecs/features/qt_functions.prf
+++ b/qtbase/mkspecs/features/qt_functions.prf
@@ -106,7 +106,7 @@ defineTest(qtAddModule) {
unset(LINKAGE)
mac {
CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
- QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT}
+ QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers
!qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
INCLUDEPATH -= $$FRAMEWORK_INCLUDE
@@ -114,7 +114,7 @@ defineTest(qtAddModule) {
}
LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
} else:!qt_no_framework { #detection
- for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
+ for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
exists($${frmwrk_dir}/$${MODULE_NAME}.framework) {
QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers
--
1.7.3.4
|
