Title: [128179] trunk/Tools
- Revision
- 128179
- Author
- [email protected]
- Date
- 2012-09-11 06:55:50 -0700 (Tue, 11 Sep 2012)
Log Message
[Qt] Fix passing of defines from the build system
We explicitly have to pass -DENABLE_FOO=0 for every single feature
that's not explicitly enabled in WEBKIT_CONFIG, since Platform.h
will add it's own defaults if the features are not defined.
At some point we might want to run a configure-test to inspect what
Platform.h will do, so we can sync up the build system's view of
the feature-defines with the compile-time situation.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128178 => 128179)
--- trunk/Tools/ChangeLog 2012-09-11 13:51:45 UTC (rev 128178)
+++ trunk/Tools/ChangeLog 2012-09-11 13:55:50 UTC (rev 128179)
@@ -1,5 +1,21 @@
2012-09-11 Tor Arne Vestbø <[email protected]>
+ [Qt] Fix passing of defines from the build system
+
+ We explicitly have to pass -DENABLE_FOO=0 for every single feature
+ that's not explicitly enabled in WEBKIT_CONFIG, since Platform.h
+ will add it's own defaults if the features are not defined.
+
+ At some point we might want to run a configure-test to inspect what
+ Platform.h will do, so we can sync up the build system's view of
+ the feature-defines with the compile-time situation.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/functions.prf:
+
+2012-09-11 Tor Arne Vestbø <[email protected]>
+
[Qt] Fix --qt option to build-webkit
Reviewed by Ossy.
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (128178 => 128179)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-11 13:51:45 UTC (rev 128178)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-11 13:55:50 UTC (rev 128179)
@@ -360,10 +360,12 @@
# To prevent clashes with Platform.h, we have to explicitly
# disable features that are not enabled.
for(define, FEATURE_DEFAULTS) {
- disabledFeature = $$find(define, =0$)
- isEmpty(disabledFeature): next()
+ anyFeatureDefine = $$find(define, =.$)
+ isEmpty(anyFeatureDefine): next()
- enabledFeature = $$replace(disabledFeature, =0$, =1)
+ enabledFeature = $$replace(anyFeatureDefine, =.$, =1)
+ disabledFeature = $$replace(anyFeatureDefine, =.$, =0)
+
!contains(defines, $$enabledFeature) {
defines += $$disabledFeature
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
