[Qt] Fix build of modules depending on QtWebKit when using prefix

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

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-11-07
Reviewed by Simon Hausmann.

.:

.qmake.conf loads qt_build_config.prf, which nowadays is responsible for
adding the path to .qmake.super (before it was done by default_pre.prf,
so having setting the path in our default_pre wrapper was sufficient).

* .qmake.conf:

Tools:

Remove setting of MODULE_QMAKE_OUTDIR from here, it's been moved to .qmake.conf.

* qmake/mkspecs/features/default_pre.prf:

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

diff --git a/.qmake.conf b/.qmake.conf
index 1889acc259c515c1a3d82182fa0ee9ca42ffde91..646dc0ce0bb661e6034498fb2647b53930672a83 100644 (file)
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,4 @@
-QMAKEPATH += $$PWD/Tools/qmake $$shadowed($$PWD/Tools/qmake)
+# The qmake generated module files belong into our Tools/qmake dir
+MODULE_QMAKE_OUTDIR = $$shadowed($$PWD/Tools/qmake)
+QMAKEPATH += $$PWD/Tools/qmake $$MODULE_QMAKE_OUTDIR
 load(qt_build_config)

diff --git a/ChangeLog b/ChangeLog
index f3d1644b5ba83d07a8a2f3250d0be68ef04bca37..fc8012c36a66b7d13e947ff3502c4e011841d526 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-11-07  Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
+
+        [Qt] Fix build of modules depending on QtWebKit when using prefix
+        https://bugs.webkit.org/show_bug.cgi?id=101437
+
+        Reviewed by Simon Hausmann.
+
+        .qmake.conf loads qt_build_config.prf, which nowadays is responsible for
+        adding the path to .qmake.super (before it was done by default_pre.prf,
+        so having setting the path in our default_pre wrapper was sufficient).
+
+        * .qmake.conf:
+
 2012-11-06  Keishi Hattori  <keishi@webkit.org>
 
         Implement month picking to calendar picker

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4b3809865ca33f1844e1fde151fe43d978b93ae7..929012d071bf2ad5ace120a46189c1eed9b84af8 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2012-11-07  Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
+
+        [Qt] Fix build of modules depending on QtWebKit when using prefix
+        https://bugs.webkit.org/show_bug.cgi?id=101437
+
+        Reviewed by Simon Hausmann.
+
+        Remove setting of MODULE_QMAKE_OUTDIR from here, it's been moved to .qmake.conf.
+
+        * qmake/mkspecs/features/default_pre.prf:
+
 2012-11-06  Dan Beam  <dbeam@chromium.org>
 
         Enable REQUEST_AUTOCOMPLETE for chromium port

diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
index 739910bf11ff2b03812f3f2b0704b0c952d7d028..39eec9bb560623e1db497936fd1681cf5cb09c87 100644 (file)
--- a/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/default_pre.prf
@@ -25,9 +25,6 @@ ROOT_WEBKIT_DIR = $$replace(PWD, /Tools/qmake/mkspecs/features$,)
 WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
 ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
 
-# The qmake generated module files belong into our Tools/qmake dir
-MODULE_QMAKE_OUTDIR = $$ROOT_BUILD_DIR/Tools/qmake
-
 # Now we're ready to load default_pre from Qt
 load(default_pre)