Title: [143201] trunk/Tools
- Revision
- 143201
- Author
- commit-qu...@webkit.org
- Date
- 2013-02-18 05:21:53 -0800 (Mon, 18 Feb 2013)
Log Message
[Qt] Disable the build if certain configure checks fail
https://bugs.webkit.org/show_bug.cgi?id=110094
Patch by Simon Hausmann <simon.hausm...@digia.com> on 2013-02-18
Reviewed by Tor Arne Vestbø.
Allow for the build to be skipped (clear out SUBDIRS) if certain
configure conditions aren't met.
* qmake/mkspecs/features/configure.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (143200 => 143201)
--- trunk/Tools/ChangeLog 2013-02-18 13:20:38 UTC (rev 143200)
+++ trunk/Tools/ChangeLog 2013-02-18 13:21:53 UTC (rev 143201)
@@ -1,3 +1,15 @@
+2013-02-18 Simon Hausmann <simon.hausm...@digia.com>
+
+ [Qt] Disable the build if certain configure checks fail
+ https://bugs.webkit.org/show_bug.cgi?id=110094
+
+ Reviewed by Tor Arne Vestbø.
+
+ Allow for the build to be skipped (clear out SUBDIRS) if certain
+ configure conditions aren't met.
+
+ * qmake/mkspecs/features/configure.prf:
+
2013-02-15 Allan Sandfeld Jensen <allan.jen...@digia.com>
[Qt][WK2] Support WK2 API tests
Modified: trunk/Tools/qmake/mkspecs/features/configure.prf (143200 => 143201)
--- trunk/Tools/qmake/mkspecs/features/configure.prf 2013-02-18 13:20:38 UTC (rev 143200)
+++ trunk/Tools/qmake/mkspecs/features/configure.prf 2013-02-18 13:21:53 UTC (rev 143201)
@@ -109,8 +109,13 @@
error(Done computing defaults)
}
- # Sanity check that would prevent us from building the whole project altogether.
- !mac:!contains(QT_CONFIG,icu): error("To build QtWebKit with Qt 5 you need to build Qt 5 with libICU support. Check for ICU support being mentioned in qtbase/config.summary.")
+ # Sanity checks that would prevent us from building the whole project altogether.
+ !mac:!contains(QT_CONFIG,icu) {
+ skipBuildReason = "ICU is required. To build QtWebKit with Qt 5 you need to build Qt 5 with libICU support. Check for ICU support being mentioned in qtbase/config.summary.")
+ }
+ production_build:blackberry {
+ skipBuildReason = "Build not supported on BB10 yet."
+ }
# Detect changes to the configuration. Changes need a clean build.
webkit_configured {
@@ -227,7 +232,13 @@
}
}
- log("$${EOL}WebKit is now configured for building. Just run 'make'.$${EOL}$${EOL}")
+ !isEmpty(skipBuildReason) {
+ log("$${EOL}WebKit build disabled: " $$skipBuildReason "$${EOL}$${EOL}")
+ SUBDIRS=
+ export(SUBDIRS)
+ } else {
+ log("$${EOL}WebKit is now configured for building. Just run 'make'.$${EOL}$${EOL}")
+ }
configuration_changed {
log(WARNING: The configuration was changed since the last build:$${EOL}$${EOL})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
