diff options
| author | commit-queue@webkit.org <commit-queue@webkit.org> | 2013-02-18 13:21:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 15:14:25 +0100 |
| commit | b6e4eda98d30e75dbd0062cb3bbd416ec3b9592c (patch) | |
| tree | fe5d69d6c3eed9f0119506c5e615a4b7072990e1 | |
| parent | 9ca8b2f302d7396b24f448a3ba4e45ef5c6a1018 (diff) | |
| download | qtwebkit-b6e4eda98d30e75dbd0062cb3bbd416ec3b9592c.tar.gz | |
Disable the build if certain configure checks fail https://bugs.webkit.org/show_bug.cgi?id=110094
Patch by Simon Hausmann <simon.hausmann@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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@143201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I4ceb213c728dd42391a3920073fe5cda9a279a0c
Reviewed-by: Tobias Koenig
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Tools/ChangeLog | 12 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 17 |
2 files changed, 26 insertions, 3 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index e218e8e98..e4bb73197 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2013-02-18 Simon Hausmann <simon.hausmann@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-01-14 Jocelyn Turcotte <jocelyn.turcotte@digia.com> [Qt] The Qt's configuration isn't honoured regarding the use of the system libpng and libjpeg diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 81b6f0ea1..c093f3295 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -109,8 +109,13 @@ defineTest(finalizeConfigure) { 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 { @@ -226,7 +231,13 @@ defineTest(finalizeConfigure) { } } - 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}) |