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 <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Eckhart Koppen <eckhart.koppen@nokia.com>

diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index c91d543..ebb94e2 100644 (file)
--- 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)