Title: [129129] trunk/Tools
- Revision
- 129129
- Author
- [email protected]
- Date
- 2012-09-20 07:11:51 -0700 (Thu, 20 Sep 2012)
Log Message
[Qt] Fix initial build
Reviewed by Tor Arne Vestbø.
When building QtWebKit the first time there is no qt_webkit.pri module pri file, and therefore
$$QT.webkit.name isn't set and so creating_module isn't set. That has all sorts of implications
causing incorrect linking for Makefile.api, etc.
Fix the determination by simply checking if MODULE is set, which only happens in api.pri.
* qmake/mkspecs/features/webkit_modules.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129128 => 129129)
--- trunk/Tools/ChangeLog 2012-09-20 14:01:23 UTC (rev 129128)
+++ trunk/Tools/ChangeLog 2012-09-20 14:11:51 UTC (rev 129129)
@@ -1,3 +1,17 @@
+2012-09-20 Simon Hausmann <[email protected]>
+
+ [Qt] Fix initial build
+
+ Reviewed by Tor Arne Vestbø.
+
+ When building QtWebKit the first time there is no qt_webkit.pri module pri file, and therefore
+ $$QT.webkit.name isn't set and so creating_module isn't set. That has all sorts of implications
+ causing incorrect linking for Makefile.api, etc.
+
+ Fix the determination by simply checking if MODULE is set, which only happens in api.pri.
+
+ * qmake/mkspecs/features/webkit_modules.prf:
+
2012-09-20 Sheriff Bot <[email protected]>
Unreviewed, rolling out r129091.
Modified: trunk/Tools/qmake/mkspecs/features/webkit_modules.prf (129128 => 129129)
--- trunk/Tools/qmake/mkspecs/features/webkit_modules.prf 2012-09-20 14:01:23 UTC (rev 129128)
+++ trunk/Tools/qmake/mkspecs/features/webkit_modules.prf 2012-09-20 14:11:51 UTC (rev 129129)
@@ -37,7 +37,7 @@
!contains(QT, webkit): DEFINES += STATICALLY_LINKED_WITH_$$library
}
-contains(TARGET, $$resolveFinalLibraryName($${QT.webkit.name})): CONFIG += creating_module
+!isEmpty(MODULE): CONFIG += creating_module
creating_module {
# Sanitize PKGCONFIG as we don't want any of these libraries
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
