Title: [129407] trunk
- Revision
- 129407
- Author
- [email protected]
- Date
- 2012-09-24 13:47:45 -0700 (Mon, 24 Sep 2012)
Log Message
Unreviewed, rolling out r129343.
http://trac.webkit.org/changeset/129343
https://bugs.webkit.org/show_bug.cgi?id=97479
It broke the build (Requested by Ossy_NIGHT on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-09-24
.:
* Source/api.pri:
Tools:
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/ChangeLog (129406 => 129407)
--- trunk/ChangeLog 2012-09-24 20:34:35 UTC (rev 129406)
+++ trunk/ChangeLog 2012-09-24 20:47:45 UTC (rev 129407)
@@ -1,5 +1,15 @@
2012-09-24 Sheriff Bot <[email protected]>
+ Unreviewed, rolling out r129343.
+ http://trac.webkit.org/changeset/129343
+ https://bugs.webkit.org/show_bug.cgi?id=97479
+
+ It broke the build (Requested by Ossy_NIGHT on #webkit).
+
+ * Source/api.pri:
+
+2012-09-24 Sheriff Bot <[email protected]>
+
Unreviewed, rolling out r129388.
http://trac.webkit.org/changeset/129388
https://bugs.webkit.org/show_bug.cgi?id=97477
Modified: trunk/Source/api.pri (129406 => 129407)
--- trunk/Source/api.pri 2012-09-24 20:34:35 UTC (rev 129406)
+++ trunk/Source/api.pri 2012-09-24 20:47:45 UTC (rev 129407)
@@ -31,10 +31,6 @@
QT_API_DEPENDS = core gui network
build?(webkit1): QT_API_DEPENDS += widgets
-# 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 (129406 => 129407)
--- trunk/Tools/ChangeLog 2012-09-24 20:34:35 UTC (rev 129406)
+++ trunk/Tools/ChangeLog 2012-09-24 20:47:45 UTC (rev 129407)
@@ -1,3 +1,13 @@
+2012-09-24 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r129343.
+ http://trac.webkit.org/changeset/129343
+ https://bugs.webkit.org/show_bug.cgi?id=97479
+
+ It broke the build (Requested by Ossy_NIGHT on #webkit).
+
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-09-24 Zan Dobersek <[email protected]>
[Gtk] Unskip the Shadow DOM layout tests
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (129406 => 129407)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-24 20:34:35 UTC (rev 129406)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-24 20:47:45 UTC (rev 129407)
@@ -25,8 +25,6 @@
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
