Commit 56052369 authored by Michael Brüning's avatar Michael Brüning Committed by Michael Bruning
Browse files

Print a more descriptive warning when a build is skipped.


This should help users understand which prerequisites are
missing from their system and may also help find invalid CI
configuration quicker.

Change-Id: If564825c11782b6e760f016893010008d9a551fa
Reviewed-by: default avatarAndras Becsi <andras.becsi@digia.com>
Showing with 8 additions and 1 deletion
defineTest(isPlatformSupported) { defineTest(isPlatformSupported) {
static: return(false) static: return(false)
osx:lessThan(QMAKE_XCODE_VERSION, 5.1): return(false) osx:lessThan(QMAKE_XCODE_VERSION, 5.1) {
warning("Using xcode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
return(false)
}
linux-g++*:!isGCCVersionSupported():return(false) linux-g++*:!isGCCVersionSupported():return(false)
!isPythonVersionSupported(): return(false) !isPythonVersionSupported(): return(false)
linux-g++*|win32-msvc2013|macx-clang: return(true) linux-g++*|win32-msvc2013|macx-clang: return(true)
boot2qt: return(true) boot2qt: return(true)
warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".)
return(false) return(false)
} }
...@@ -13,6 +18,7 @@ defineTest(isPythonVersionSupported) { ...@@ -13,6 +18,7 @@ defineTest(isPythonVersionSupported) {
python_major_version = $$system('python -c "import sys; print sys.version_info.major"') python_major_version = $$system('python -c "import sys; print sys.version_info.major"')
python_minor_version = $$system('python -c "import sys; print sys.version_info.minor"') python_minor_version = $$system('python -c "import sys; print sys.version_info.minor"')
greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true) greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true)
warning("Using Python version "$$python_major_version"."$$python_minor_version", but at least Python version 2.7 is required to build Qt WebEngine.")
return(false) return(false)
} }
...@@ -20,6 +26,7 @@ defineTest(isGCCVersionSupported) { ...@@ -20,6 +26,7 @@ defineTest(isGCCVersionSupported) {
# The below will work for gcc 4.6 and up and also match gcc 5 # The below will work for gcc 4.6 and up and also match gcc 5
greaterThan(QT_GCC_MINOR_VERSION, 5):return(true) greaterThan(QT_GCC_MINOR_VERSION, 5):return(true)
greaterThan(QT_GCC_MAJOR_VERSION, 4):return(true) greaterThan(QT_GCC_MAJOR_VERSION, 4):return(true)
warning("Using gcc version "$$QT_GCC_MAJOR_VERSION"."$$QT_GCC_MINOR_VERSION", but at least gcc version 4.6 is required to build Qt WebEngine.")
return(false) return(false)
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment