From 7d453a0526fdc001b8af826756030cc571110403 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 4 Jan 2016 15:40:06 +0100 Subject: Allow build on all Linux platforms Support also irregular mkspec names like linux-imx6-g++. We officially only support boot2qt for embedded Linux, but that's no reason to prevent builing on other configurations. Also, the line between embedded and Desktop Linux is blurry. Task-number: QTBUG-49249 Task-number: QTBUG-50259 Change-Id: If5b87a21bb226194c8340430be958d42ae80b537 Reviewed-by: Joerg Bornemann --- tools/qmake/mkspecs/features/functions.prf | 46 +++++++++++++++++++----------- 1 file changed, 30 insertions(+), 16 deletions(-) (limited to 'tools/qmake/mkspecs') diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 2447d8372..e9d801e51 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -1,30 +1,44 @@ defineTest(isPlatformSupported) { - !linux-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt { - skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.") - return(false) - } - !contains(QT_CONFIG, c++11) { - skipBuild("C++11 support is required in order to build chromium.") - return(false) - } - static { - skipBuild("Static builds of QtWebEngine aren't supported.") - return(false) - } - osx { + linux { + !gcc:!clang { + skipBuild("Qt WebEngine on Linux requires clang or GCC.") + return(false) + } + gcc:!clang:!isGCCVersionSupported(): return(false) + } else:win32 { + msvc { + !equals(MSVC_VER, "12.0"):!equals(MSVC_VER, "14.0") { + skipBuild("Qt WebEngine on Windows requires MSVC 2013 or MSVC 2015.") + return(false) + } + } else { + skipBuild("Qt WebEngine on Windows requires MSVC 2013 or MSVC 2015.") + return(false) + } + } else:osx { lessThan(QMAKE_XCODE_VERSION, 5.1) { - skipBuild("Using xcode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") + skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") return(false) } # We require OS X 10.9 (darwin version 13.0.0) or newer darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) lessThan(darwin_major_version, 13) { - skipBuild("OS X version 10.9 or newer is required to build Qt WebEngine.") + skipBuild("Qt WebEngine requires OS X version 10.9 or newer.") return(false) } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.") + return(false) } - linux-g++*:!isGCCVersionSupported(): return(false) + !contains(QT_CONFIG, c++11) { + skipBuild("C++11 support is required in order to build chromium.") + return(false) + } + static { + skipBuild("Static builds of QtWebEngine aren't supported.") + return(false) + } !isPythonVersionSupported(): return(false) return(true) } -- cgit v1.2.3 From ed5b65c70397f3ea9fa524e7f0b98a48a70ddc88 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 29 Jan 2016 14:46:13 +0100 Subject: Disable WebSpeech Also allows us to remove code handling libFLAC and libspeex since we no longer depend on those. Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa Reviewed-by: Joerg Bornemann --- tools/qmake/mkspecs/features/configure.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/qmake/mkspecs') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 4be9fac20..4cb4600b6 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -41,7 +41,7 @@ defineTest(runConfigure) { else: log("System libwebp or libwebpdemux not found. Using Chromium's copies.$${EOL}") packagesExist(libxml-2.0,libxslt): WEBENGINE_CONFIG += use_system_libxslt else: log("System libxml2 or libxslt not found. Using Chromium's copies.$${EOL}") - for(package, $$list("libevent flac jsoncpp opus speex")) { + for(package, $$list("libevent jsoncpp opus")) { packagesExist($$package): WEBENGINE_CONFIG += use_system_$$package else: log("System $$package not found. Using Chromium's copy.$${EOL}") } -- cgit v1.2.3 From 82f4d13a13b40d9cb7710f6dd4190175a272a394 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 29 Jan 2016 12:22:11 +0100 Subject: winrt: Disable build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WinRT is not a supported platform and checks to disable the build have been removed in previous refactorings. Change-Id: I22d2a8ae28f7cfaa3b962ac353ad5c14f11771a9 Reviewed-by: Michael Brüning --- tools/qmake/mkspecs/features/functions.prf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/qmake/mkspecs') diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index e9d801e51..2df689bca 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -6,6 +6,10 @@ defineTest(isPlatformSupported) { } gcc:!clang:!isGCCVersionSupported(): return(false) } else:win32 { + winrt { + skipBuild("WinRT is not supported.") + return(false) + } msvc { !equals(MSVC_VER, "12.0"):!equals(MSVC_VER, "14.0") { skipBuild("Qt WebEngine on Windows requires MSVC 2013 or MSVC 2015.") -- cgit v1.2.3