summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-06-03 10:36:47 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-06-03 10:37:18 +0300
commit0091d248e0cef31ea9651884b90fd3e43d4e388d (patch)
treea4f8253c120c6d27751d84a1fbac33c49bc80755
parente922b137d268fb79c40c37c992de4f5eca832dd6 (diff)
parentf6e140a21996c90c698eff15f3f828b182c3c03d (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12: f6e140a Skip build without QtQuick a8483ed Doc: Bump version to 5.12.4 Conflicts: .qmake.conf Change-Id: I21da08f549f503e45ce6b2ada8afa52ec4e2e2dc
-rw-r--r--qtdeviceutilities.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/qtdeviceutilities.pro b/qtdeviceutilities.pro
index 3bdf551..9a13a84 100644
--- a/qtdeviceutilities.pro
+++ b/qtdeviceutilities.pro
@@ -1,3 +1,4 @@
requires(linux)
+requires(qtHaveModule(quick))
load(qt_parts)