[Qt] Add top-level .qmake.conf

With Qt5, this makes setting $QMAKEPATH externally unnecessary.

The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
hurt, and is still required for Qt4.

https://bugs.webkit.org/show_bug.cgi?id=90461

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-07-06
Reviewed by Tor Arne Vestbø.

.:

* .qmake.conf: Added.
* WebKit.pro:

Tools:

* qmake/mkspecs/features/default_pre.prf:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644 (file)
index 0000000..78f46ce
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1 @@
+QMAKEPATH += $$PWD/Tools/qmake $$shadowed($$PWD/Tools/qmake)

diff --git a/ChangeLog b/ChangeLog
index 0ed07c3..c87373b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
 
+        [Qt] Add top-level .qmake.conf
+
+        With Qt5, this makes setting $QMAKEPATH externally unnecessary.
+
+        The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
+        hurt, and is still required for Qt4.
+
+        https://bugs.webkit.org/show_bug.cgi?id=90461
+
+        Reviewed by Tor Arne Vestbø.
+
+        * .qmake.conf: Added.
+        * WebKit.pro:
+
+2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
         [Qt] Let qt_module_config create the forwarding module pri file
 
         https://bugs.webkit.org/show_bug.cgi?id=90461

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 952f8e6..32c7318 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,20 @@
 2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
 
+        [Qt] Add top-level .qmake.conf
+
+        With Qt5, this makes setting $QMAKEPATH externally unnecessary.
+
+        The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
+        hurt, and is still required for Qt4.
+
+        https://bugs.webkit.org/show_bug.cgi?id=90461
+
+        Reviewed by Tor Arne Vestbø.
+
+        * qmake/mkspecs/features/default_pre.prf:
+
+2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
         [Qt] Unify qtFeatureDefaults code paths
 
         There's no reason to run qmake on features.prf directly anymore, as we

diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
index 9a04187..01cc41a 100644 (file)
--- a/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/default_pre.prf
@@ -69,9 +69,11 @@ win32* {
     isEmpty(pwd_starts_with_slash): CONFIG += win_cmd_shell
 }
 
-# Make sure QMAKEPATH is set for recursive targets
-win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
-else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+haveQt(4) {
+    # Make sure QMAKEPATH is set for recursive targets
+    win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
+    else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+}
 
 # Default location of generated sources
 GENERATED_SOURCES_DESTDIR = generated

diff --git a/WebKit.pro b/WebKit.pro
index 6cc7e6d..8d4cbbb 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -5,15 +5,17 @@
 # See 'Tools/qmake/README' for an overview of the build system
 # -------------------------------------------------------------------
 
+haveQt(4) {
+    QMAKEPATH = $$(QMAKEPATH)
+    isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
+        error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
+        # Otherwise we won't pick up the feature prf files needed for the build
+    }
+}
+
 TEMPLATE = subdirs
 CONFIG += ordered
 
-QMAKEPATH = $$(QMAKEPATH)
-isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
-    error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
-    # Otherwise we won't pick up the feature prf files needed for the build
-}
-
 WTF.file = Source/WTF/WTF.pro
 WTF.makefile = Makefile.WTF
 SUBDIRS += WTF