Title: [133730] trunk
- Revision
- 133730
- Author
- [email protected]
- Date
- 2012-11-07 01:32:33 -0800 (Wed, 07 Nov 2012)
Log Message
[Qt] Fix build of modules depending on QtWebKit when using prefix
https://bugs.webkit.org/show_bug.cgi?id=101437
Patch by Oswald Buddenhagen <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/.qmake.conf (133729 => 133730)
--- trunk/.qmake.conf 2012-11-07 08:54:46 UTC (rev 133729)
+++ trunk/.qmake.conf 2012-11-07 09:32:33 UTC (rev 133730)
@@ -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)
Modified: trunk/ChangeLog (133729 => 133730)
--- trunk/ChangeLog 2012-11-07 08:54:46 UTC (rev 133729)
+++ trunk/ChangeLog 2012-11-07 09:32:33 UTC (rev 133730)
@@ -1,3 +1,16 @@
+2012-11-07 Oswald Buddenhagen <[email protected]>
+
+ [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 <[email protected]>
Implement month picking to calendar picker
Modified: trunk/Tools/ChangeLog (133729 => 133730)
--- trunk/Tools/ChangeLog 2012-11-07 08:54:46 UTC (rev 133729)
+++ trunk/Tools/ChangeLog 2012-11-07 09:32:33 UTC (rev 133730)
@@ -1,3 +1,14 @@
+2012-11-07 Oswald Buddenhagen <[email protected]>
+
+ [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 <[email protected]>
Enable REQUEST_AUTOCOMPLETE for chromium port
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (133729 => 133730)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-11-07 08:54:46 UTC (rev 133729)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-11-07 09:32:33 UTC (rev 133730)
@@ -25,9 +25,6 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
