diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:13:46 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:13:46 +0300 |
| commit | a87a9d1a3054267b39618cb2f3762a0a05ac510c (patch) | |
| tree | b976b9f57b09bb5406837631872400679e23a16d | |
| parent | e3e9f9bf42c22565f226b3431cb8c17502cc2e7a (diff) | |
| parent | 3eaed3d6fa15d8a29cb8d8d683aaea9b256a36b1 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
Change-Id: I10fccb2e1b71d1ea54cad9e7ab916c491e1200e1
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/location/configure.json | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index a397b28c..d557e9df 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,7 +3,7 @@ CONFIG += warning_clean DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.9 +MODULE_VERSION = 5.15.10 # Adds a way to debug location. The define is needed for multiple subprojects as they # include the essential headers. diff --git a/src/location/configure.json b/src/location/configure.json index 6d01a9a3..8d8895ce 100644 --- a/src/location/configure.json +++ b/src/location/configure.json @@ -9,7 +9,10 @@ "label": "Qt.labs.location experimental QML plugin", "purpose": "Provides experimental QtLocation QML types", "section": "Location", - "condition": "config.opengl", + "condition": [ + "features.gui", + "features.opengl" + ], "output": [ "privateFeature" ] }, "geoservices_osm": { |