Title: [120686] trunk
- Revision
- 120686
- Author
- [email protected]
- Date
- 2012-06-19 00:35:06 -0700 (Tue, 19 Jun 2012)
Log Message
[Qt] Allow the modules file generation to work on Windows.
https://bugs.webkit.org/show_bug.cgi?id=89010
Patch by Joel Dillon <[email protected]>, Jocelyn Turcotte <[email protected]> on 2012-06-19
Reviewed by Csaba Osztrogonác.
Add calls to toSystemPath and use QMAKE_DIR_SEP where necessary.
* Source/api.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (120685 => 120686)
--- trunk/ChangeLog 2012-06-19 07:32:50 UTC (rev 120685)
+++ trunk/ChangeLog 2012-06-19 07:35:06 UTC (rev 120686)
@@ -1,3 +1,14 @@
+2012-06-19 Joel Dillon <[email protected]>, Jocelyn Turcotte <[email protected]>
+
+ [Qt] Allow the modules file generation to work on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=89010
+
+ Reviewed by Csaba Osztrogonác.
+
+ Add calls to toSystemPath and use QMAKE_DIR_SEP where necessary.
+
+ * Source/api.pri:
+
2012-06-19 Jocelyn Turcotte <[email protected]>
[Qt] Fix TARGET not properly being set for QtWebKitd5.dll when building in debug.
Modified: trunk/Source/api.pri (120685 => 120686)
--- trunk/Source/api.pri 2012-06-19 07:32:50 UTC (rev 120685)
+++ trunk/Source/api.pri 2012-06-19 07:35:06 UTC (rev 120686)
@@ -46,7 +46,7 @@
!build_pass {
# Make a more accessible copy of the module forward file
# in the WebKit build directory.
- convenience_module_path = $${ROOT_BUILD_DIR}/modules
+ convenience_module_path = $$toSystemPath($${ROOT_BUILD_DIR})$${QMAKE_DIR_SEP}modules
module_filename = $$basename(QT.webkit.module_pri)
# The QMAKE_EXTRA_MODULE_FORWARDS might contain more than one path,
@@ -62,10 +62,10 @@
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.target = $$convenience_module_path$${QMAKE_DIR_SEP}$$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
+ && echo \"include($$webkit_module_forward$${QMAKE_DIR_SEP}$$module_filename)\" > $$convenience_module_path$${QMAKE_DIR_SEP}$$module_filename
+ make_module_fwd_convenience.depends = $$webkit_module_forward$${QMAKE_DIR_SEP}$$module_filename
QMAKE_EXTRA_TARGETS += make_module_fwd_convenience
DEFAULT_TARGETS += make_module_fwd_convenience
@@ -74,12 +74,12 @@
qt_developer_build {
# Copy the module forward file into Qt so that the module
# is immediately accessible.
- qt_modules_path = $$[QT_INSTALL_PREFIX]/mkspecs/modules
+ qt_modules_path = $$[QT_INSTALL_PREFIX]$${QMAKE_DIR_SEP}mkspecs$${QMAKE_DIR_SEP}modules
- copy_module_fwd_file.target = $$qt_modules_path/$$module_filename
- copy_module_fwd_file.commands = $$QMAKE_COPY $$QMAKE_EXTRA_MODULE_FORWARDS/$$module_filename $$qt_modules_path
+ copy_module_fwd_file.target = $$qt_modules_path$${QMAKE_DIR_SEP}$$module_filename
+ copy_module_fwd_file.commands = $$QMAKE_COPY $$toSystemPath($$QMAKE_EXTRA_MODULE_FORWARDS)$${QMAKE_DIR_SEP}$$module_filename $$qt_modules_path
# FIXME: Add dependendy that ensures we copy the forward file if the target is updated
- copy_module_fwd_file.depends = $$QMAKE_EXTRA_MODULE_FORWARDS/$$module_filename
+ copy_module_fwd_file.depends = $$QMAKE_EXTRA_MODULE_FORWARDS$${QMAKE_DIR_SEP}$$module_filename
QMAKE_EXTRA_TARGETS += copy_module_fwd_file
DEFAULT_TARGETS += copy_module_fwd_file
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
