Title: [129471] trunk
- Revision
- 129471
- Author
- [email protected]
- Date
- 2012-09-25 01:08:17 -0700 (Tue, 25 Sep 2012)
Log Message
[Qt] Fix build with latest Qt 5
https://bugs.webkit.org/show_bug.cgi?id=97479
Reviewed by Tor Arne Vestbø.
.:
Define MODULE_BASE_DIR before loading qt_module.prf, which now calls syncqt. MODULE_BASE_DIR is
passed as last parameter (source dir) to syncqt now, so set it to the directory that contains
sync.profile.
* Source/api.pri:
Tools:
The variables for syncqt handling are now set in api.pri, but let's add a comment here that we can
remove them from default_pre.prf once we're past Qt 5 beta2.
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/ChangeLog (129470 => 129471)
--- trunk/ChangeLog 2012-09-25 08:05:18 UTC (rev 129470)
+++ trunk/ChangeLog 2012-09-25 08:08:17 UTC (rev 129471)
@@ -1,3 +1,16 @@
+2012-09-24 Simon Hausmann <[email protected]>
+
+ [Qt] Fix build with latest Qt 5
+ https://bugs.webkit.org/show_bug.cgi?id=97479
+
+ Reviewed by Tor Arne Vestbø.
+
+ Define MODULE_BASE_DIR before loading qt_module.prf, which now calls syncqt. MODULE_BASE_DIR is
+ passed as last parameter (source dir) to syncqt now, so set it to the directory that contains
+ sync.profile.
+
+ * Source/api.pri:
+
2012-09-24 Bo Liu <[email protected]>
Reland "Add in-place reload behavior to ImagesEnabled setting" with optimizations
Modified: trunk/Source/api.pri (129470 => 129471)
--- trunk/Source/api.pri 2012-09-25 08:05:18 UTC (rev 129470)
+++ trunk/Source/api.pri 2012-09-25 08:08:17 UTC (rev 129471)
@@ -31,6 +31,13 @@
QT_API_DEPENDS = core gui network
build?(webkit1): QT_API_DEPENDS += widgets
+qmakeVersion=$$[QMAKE_VERSION]
+equals(qmakeVersion, 3.0) {
+ # We want the QtWebKit API forwarding includes to live in the root build dir.
+ MODULE_BASE_DIR = $$_PRO_FILE_PWD_
+ MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
+}
+
# We load the relevant modules here, so that the effects of each module
# on the QT variable can be picked up when we later load(qt_module).
load(webkit_modules)
Modified: trunk/Tools/ChangeLog (129470 => 129471)
--- trunk/Tools/ChangeLog 2012-09-25 08:05:18 UTC (rev 129470)
+++ trunk/Tools/ChangeLog 2012-09-25 08:08:17 UTC (rev 129471)
@@ -1,3 +1,15 @@
+2012-09-24 Simon Hausmann <[email protected]>
+
+ [Qt] Fix build with latest Qt 5
+ https://bugs.webkit.org/show_bug.cgi?id=97479
+
+ Reviewed by Tor Arne Vestbø.
+
+ The variables for syncqt handling are now set in api.pri, but let's add a comment here that we can
+ remove them from default_pre.prf once we're past Qt 5 beta2.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-09-25 Zan Dobersek <[email protected]>
Unreviewed, adjusting the test cases after r129459. The JSON data
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (129470 => 129471)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-25 08:05:18 UTC (rev 129470)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-25 08:08:17 UTC (rev 129471)
@@ -25,6 +25,8 @@
WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
+# ### FIXME: Remove this after Qt 5 beta 2. Syncqt is not called from default_pre.prf
+# anymore, so this was moved to api.pri.
# We want the QtWebKit API forwarding includes to live in the root build dir.
MODULE_BASE_DIR = $$ROOT_WEBKIT_DIR
MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
