Permalink
Browse files

[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: http://svn.webkit.org/repository/webkit/trunk@133730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
1 parent 5c28758 commit a1a74b10b094ee8c7106e4902f0879ed10218648 hausmann@webkit.org committed Nov 7, 2012
Showing with 27 additions and 4 deletions.
  1. +3 −1 .qmake.conf
  2. +13 −0 ChangeLog
  3. +11 −0 Tools/ChangeLog
  4. +0 −3 Tools/qmake/mkspecs/features/default_pre.prf
View
@@ -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)
View
@@ -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
View
@@ -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
@@ -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)

0 comments on commit a1a74b1

Please sign in to comment.