Title: [110702] trunk
- Revision
- 110702
- Author
- [email protected]
- Date
- 2012-03-14 08:28:34 -0700 (Wed, 14 Mar 2012)
Log Message
[Qt] Deal with multiple paths in QMAKE_EXTRA_MODULE_FORWARDS
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/ChangeLog (110701 => 110702)
--- trunk/ChangeLog 2012-03-14 15:24:13 UTC (rev 110701)
+++ trunk/ChangeLog 2012-03-14 15:28:34 UTC (rev 110702)
@@ -1,3 +1,11 @@
+2012-03-14 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Deal with multiple paths in QMAKE_EXTRA_MODULE_FORWARDS
+
+ Reviewed by Simon Hausmann.
+
+ * Source/api.pri:
+
2012-03-14 Max Vujovic <[email protected]>
GTK 32-bit Linux Release build failing after r110580 (from bug 80338)
Modified: trunk/Source/api.pri (110701 => 110702)
--- trunk/Source/api.pri 2012-03-14 15:24:13 UTC (rev 110701)
+++ trunk/Source/api.pri 2012-03-14 15:28:34 UTC (rev 110702)
@@ -52,14 +52,28 @@
convenience_module_path = $${ROOT_BUILD_DIR}/modules
module_filename = $$basename(QT.webkit.module_pri)
- make_module_fwd_convenience.target = $$convenience_module_path/$$module_filename
- make_module_fwd_convenience.commands = $$QMAKE_MKDIR $$convenience_module_path \
- && echo \"include($$QMAKE_EXTRA_MODULE_FORWARDS/$$module_filename)\" > $$convenience_module_path/$$module_filename
- make_module_fwd_convenience.depends = $$QMAKE_EXTRA_MODULE_FORWARDS/$$module_filename
+ # The QMAKE_EXTRA_MODULE_FORWARDS might contain more than one path,
+ # so we iterate the paths and find one that matches our build dir.
+ for(module_forward, QMAKE_EXTRA_MODULE_FORWARDS) {
+ in_build_dir = $$find(module_forward, ^$${ROOT_BUILD_DIR})
+ !isEmpty(in_build_dir) {
+ webkit_module_forward = $$module_forward
+ break()
+ }
+ }
- QMAKE_EXTRA_TARGETS += make_module_fwd_convenience
- DEFAULT_TARGETS += make_module_fwd_convenience
+ isEmpty(webkit_module_forward) {
+ warning(Could not resolve QMAKE_EXTRA_MODULE_FORWARDS path!)
+ } else {
+ make_module_fwd_convenience.target = $$convenience_module_path/$$module_filename
+ make_module_fwd_convenience.commands = $$QMAKE_MKDIR $$convenience_module_path \
+ && echo \"include($$webkit_module_forward/$$module_filename)\" > $$convenience_module_path/$$module_filename
+ make_module_fwd_convenience.depends = $$webkit_module_forward/$$module_filename
+ QMAKE_EXTRA_TARGETS += make_module_fwd_convenience
+ DEFAULT_TARGETS += make_module_fwd_convenience
+ }
+
qt_developer_build {
# Copy the module forward file into Qt so that the module
# is immediately accessible.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
