diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-07-24 14:13:27 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-07-26 09:59:56 +0000 |
| commit | 8c0e23f5c4c521f40f082396fd09b6e3870b5cb6 (patch) | |
| tree | 3bbb2018bdfe7a9e9ac138cffe8e2b88dcdd12d6 | |
| parent | fc5874a9c1571fe8242e00672766f8cae07ad674 (diff) | |
| download | qtapplicationmanager-8c0e23f5c4c521f40f082396fd09b6e3870b5cb6.tar.gz | |
Set the minimum supported Qt version to 5.11
This was decided, since QtWayland 5.9 has multiple problems that are not easy
to workaround (both with the new WindowManager approach and the new
Wayland extension)
Change-Id: Ia386aa86246bbc980bb456876a874510d57e8bad
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| -rw-r--r-- | application-manager.pro | 10 | ||||
| -rw-r--r-- | qmake-features/am-coverage.prf | 6 | ||||
| -rw-r--r-- | src/main-lib/main.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/application-manager.pro b/application-manager.pro index c63a48be..5b327966 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -1,5 +1,11 @@ requires(linux|win32:!winrt|macos) +!equals(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 11) { + log("$$escape_expand(\\n\\n) *** The QtApplicationManager module needs to be built against Qt 5.11+ ***$$escape_expand(\\n\\n)") + CONFIG += Qt_version_needs_to_be_at_least_5_11 +} +requires(!Qt_version_needs_to_be_at_least_5_11) + !tools-only:!qtHaveModule(qml):error("The QtQml library is required for a non 'tools-only' build") TEMPLATE = subdirs @@ -27,10 +33,6 @@ if(linux|force-libcrypto) { !if(contains(QT_CONFIG,"openssl")|contains(QT_CONFIG,"openssl-linked")|contains(QT_CONFIG,"ssl")):error("Qt was built without OpenSSL support.") } -MIN_MINOR=9 - -!equals(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, $$MIN_MINOR):error("This application needs to be built against Qt 5.$${MIN_MINOR}+") - load(am-config) !config_libyaml|no-system-libyaml { diff --git a/qmake-features/am-coverage.prf b/qmake-features/am-coverage.prf index b642b4a9..f08f190c 100644 --- a/qmake-features/am-coverage.prf +++ b/qmake-features/am-coverage.prf @@ -1,9 +1,9 @@ # generate code coverage information using gcov/lcov/genhtml CONFIG(debug,debug|release) { equals(TEMPLATE, "subdirs") { - sub-coverage.target = coverage - sub-coverage.CONFIG = recursive - QMAKE_EXTRA_TARGETS += sub-coverage + coverage.target = coverage + coverage.CONFIG = recursive + QMAKE_EXTRA_TARGETS += coverage } else { coverage_pre.commands += @echo && echo "Building with coverage support..." && echo $(eval CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage)$(eval LFLAGS += -O0 -fprofile-arcs -ftest-coverage) diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp index f922eb30..3b4faa0e 100644 --- a/src/main-lib/main.cpp +++ b/src/main-lib/main.cpp @@ -1094,9 +1094,7 @@ QString Main::hardwareId() const for (const QNetworkInterface &iface : QNetworkInterface::allInterfaces()) { if (iface.isValid() && !(iface.flags() & (QNetworkInterface::IsPointToPoint | QNetworkInterface::IsLoopBack)) -#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) && iface.type() > QNetworkInterface::Virtual -#endif && !iface.hardwareAddress().isEmpty()) { candidateIfaces << iface; } |