diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-17 21:09:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-25 09:18:13 +0200 |
| commit | d0e82ede558b4c7b0f1a89b28a224cf77a3fc068 (patch) | |
| tree | bdcfdbc36a257c21640d1c77c7d3ad5b78af1f45 | |
| parent | bd97768ae54d643270e824f74d152892dbea1b9f (diff) | |
| download | qtbase-d0e82ede558b4c7b0f1a89b28a224cf77a3fc068.tar.gz | |
mac framework build: always set QMAKE_FRAMEWORKPATH
don't mess with the -F linker flag manually. qt headers include other
headers via the canonical Module/Header syntax, which means that the
compiler also needs the -F flag. QMAKE_FRAMEWORKPATH does exactly that.
Task-number: QTBUG-29003
Change-Id: I5f4af1a462697cd6996c54436ccdb9fc2b216020
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 699c42ee1f..1d34ad5d63 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -80,10 +80,8 @@ defineTest(qtAddModule) { FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { INCLUDEPATH *= $$FRAMEWORK_INCLUDE - LINKAGE = -F$${MODULE_LIBS} - } else { - QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} } + QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX} } } |