From fd1411a8e5ec46f7841608f4baf13c7a16535a79 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Fri, 10 Jun 2011 14:26:51 -0500 Subject: Ensure we pass -developer-build to syncqt for -nokia-developer builds When the build directory is the install directory, separate modules should use qtbase as the path for libs, module pris etc. This fixes the logic in default_pre.prf so that syncqt is called correctly in these cases. Change-Id: Ib3798bfd145d3a3e43b9a222af46270245e6c2e6 Reviewed-on: http://codereview.qt.nokia.com/464 Reviewed-by: Qt Sanity Bot Reviewed-by: Marius Storm-Olsen Reviewed-by: Eckhart Koppen --- mkspecs/features/default_pre.prf | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index c91d543d6c..ebb94e272e 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -12,13 +12,21 @@ exists($$_PRO_FILE_PWD_/sync.profile) { isEmpty(QTDIR) { QTDIR = $$(QTDIR) isEmpty(QTDIR):QTDIR = $$QT_BUILD_TREE + isEmpty(QTDIR) { # figure out QTDIR based on qmake binary + QMAKE_BASED_QTDIR = $$dirname(QMAKE_QMAKE) + QTDIR = $$dirname(QMAKE_BASED_QTDIR) + unset(QMAKE_BASED_QTDIR) + } } - QTFWD = - isEmpty(QTDIR) { - QTFWD += -module-fwd $$OUT_PWD/module-paths/modules -cache-module-fwd - } else { - QTFWD += -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build + QTFWD = -module-fwd $$OUT_PWD/module-paths/modules -cache-module-fwd + !isEmpty(QTDIR) { + # Only if QTDIR points to an actual build directory + # and this build directory is the install directory + # can we tell syncqt to do a -developer-build + exists($$QTDIR/.qmake.cache):contains(QTDIR, $$[QT_INSTALL_PREFIX]) { + QTFWD = -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build + } } qtPrepareTool(QMAKE_SYNCQT, syncqt) -- cgit v1.2.3 From 8c680aceaa0e1f132501ad15c48bc549fd3fd39d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 20 Jun 2011 11:58:46 +0200 Subject: Support -debug build on Mac -Wl,-rpath-link is expected to work for all gcc except mac. Change-Id: I4b57e0088db49a8e35840d981e5d6edbb1012396 Reviewed-on: http://codereview.qt.nokia.com/506 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- mkspecs/features/qt_functions.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 50a85d86ce..86d80cb239 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -142,7 +142,7 @@ defineTest(qtAddModule) { # Make sure we can link to uninstalled libraries !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { QMAKE_LIBDIR *= $$MODULE_LIBS - unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" + unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" } if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d -- cgit v1.2.3