Changeset 143201 in webkit
- Timestamp:
- Feb 18, 2013 5:21:53 AM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r143197 r143201 1 2013-02-18 Simon Hausmann <simon.hausmann@digia.com> 2 3 [Qt] Disable the build if certain configure checks fail 4 https://bugs.webkit.org/show_bug.cgi?id=110094 5 6 Reviewed by Tor Arne Vestbø. 7 8 Allow for the build to be skipped (clear out SUBDIRS) if certain 9 configure conditions aren't met. 10 11 * qmake/mkspecs/features/configure.prf: 12 1 13 2013-02-15 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 14 -
trunk/Tools/qmake/mkspecs/features/configure.prf
r142088 r143201 110 110 } 111 111 112 # Sanity check that would prevent us from building the whole project altogether. 113 !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.") 112 # Sanity checks that would prevent us from building the whole project altogether. 113 !mac:!contains(QT_CONFIG,icu) { 114 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.") 115 } 116 production_build:blackberry { 117 skipBuildReason = "Build not supported on BB10 yet." 118 } 114 119 115 120 # Detect changes to the configuration. Changes need a clean build. … … 228 233 } 229 234 230 log("$${EOL}WebKit is now configured for building. Just run 'make'.$${EOL}$${EOL}") 235 !isEmpty(skipBuildReason) { 236 log("$${EOL}WebKit build disabled: " $$skipBuildReason "$${EOL}$${EOL}") 237 SUBDIRS= 238 export(SUBDIRS) 239 } else { 240 log("$${EOL}WebKit is now configured for building. Just run 'make'.$${EOL}$${EOL}") 241 } 231 242 232 243 configuration_changed {
Note: See TracChangeset
for help on using the changeset viewer.