Title: [99542] trunk
- Revision
- 99542
- Author
- ves...@webkit.org
- Date
- 2011-11-08 03:30:47 -0800 (Tue, 08 Nov 2011)
Log Message
[Qt] Ensure forwarding headers are generated before generating install rules
The install rule for headers depends on qmake being able to walk the list of
headers in the $build_root/include/QtWebKit directory, but this directory is
empty until we've generated the forwarding headers. So we need to make sure
the forwarding headers are generated _before_ we run qmake on the api project
file. This applies to Qt 4.8 only, as Qt 5 will run synqt as part of the
root project file (due to the sync.profile file).
https://bugs.webkit.org/show_bug.cgi?id=71697
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/ChangeLog (99541 => 99542)
--- trunk/ChangeLog 2011-11-08 11:22:27 UTC (rev 99541)
+++ trunk/ChangeLog 2011-11-08 11:30:47 UTC (rev 99542)
@@ -1,3 +1,21 @@
+2011-11-08 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Ensure forwarding headers are generated before generating install rules
+
+ The install rule for headers depends on qmake being able to walk the list of
+ headers in the $build_root/include/QtWebKit directory, but this directory is
+ empty until we've generated the forwarding headers. So we need to make sure
+ the forwarding headers are generated _before_ we run qmake on the api project
+ file. This applies to Qt 4.8 only, as Qt 5 will run synqt as part of the
+ root project file (due to the sync.profile file).
+
+ https://bugs.webkit.org/show_bug.cgi?id=71697
+
+ Reviewed by Simon Hausmann.
+
+ * Source/QtWebKit.pro:
+ * Source/api.pri:
+
2011-11-07 ChangSeok Oh <shivami...@gmail.com>
[EFL] Support requestAnimationFrame API
Modified: trunk/Source/QtWebKit.pro (99541 => 99542)
--- trunk/Source/QtWebKit.pro 2011-11-08 11:22:27 UTC (rev 99541)
+++ trunk/Source/QtWebKit.pro 2011-11-08 11:30:47 UTC (rev 99542)
@@ -26,3 +26,26 @@
examples.CONFIG += no_default_target
examples.makefile = Makefile
SUBDIRS += examples
+
+!haveQt(5):!build_pass {
+ # Use our own copy of syncqt from Qt 4.8 to generate forwarding headers
+ syncqt = $$toSystemPath($${ROOT_WEBKIT_DIR}/Tools/qmake/syncqt-4.8)
+ command = $$syncqt
+ win32-msvc*: command = $$command -windows
+
+ outdir = $$toSystemPath($${ROOT_BUILD_DIR})
+ rootdir = $$toSystemPath($${ROOT_WEBKIT_DIR})
+
+ fwheader_generator.commands = perl $${command} -outdir $${outdir} -separate-module $${TARGET}$${DIRLIST_SEPARATOR}$${rootdir}$${DIRLIST_SEPARATOR}$$toSystemPath(Source/WebKit/qt/Api)
+ fwheader_generator.depends = $${syncqt}
+
+ variables = $$computeSubdirVariables(api)
+
+ api_qmake.target = $$eval($${variables}.target)-qmake_all
+ api_qmake.depends = fwheader_generator
+
+ api_makefile.target = $$eval($${variables}.makefile)
+ api_makefile.depends = fwheader_generator
+
+ QMAKE_EXTRA_TARGETS += fwheader_generator api_qmake api_makefile
+}
Modified: trunk/Source/api.pri (99541 => 99542)
--- trunk/Source/api.pri 2011-11-08 11:22:27 UTC (rev 99541)
+++ trunk/Source/api.pri 2011-11-08 11:30:47 UTC (rev 99542)
@@ -43,21 +43,6 @@
!static: DEFINES += QT_MAKEDLL
-!haveQt(5):!build_pass {
- # Use our own copy of syncqt from Qt 4.8 to generate forwarding headers
- syncqt = $$toSystemPath($${ROOT_WEBKIT_DIR}/Tools/qmake/syncqt-4.8)
- command = $$syncqt
- win32-msvc*: command = $$command -windows
-
- outdir = $$toSystemPath($${ROOT_BUILD_DIR})
- rootdir = $$toSystemPath($${ROOT_WEBKIT_DIR})
-
- fwheader_generator.commands = perl $${command} -outdir $${outdir} -separate-module $${TARGET}$${DIRLIST_SEPARATOR}$${rootdir}$${DIRLIST_SEPARATOR}$$toSystemPath(Source/WebKit/qt/Api)
- fwheader_generator.depends = $${syncqt}
- QMAKE_EXTRA_TARGETS += fwheader_generator
- DEFAULT_TARGETS += fwheader_generator
-}
-
SOURCES += \
$$PWD/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
$$PWD/WebKit/qt/WebCoreSupport/QtWebComboBox.cpp \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
