diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-04-26 18:13:23 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-04-29 06:30:56 +0000 |
| commit | 80a9f4dfd078c4df1bc2c7fa279d637debfd672a (patch) | |
| tree | fc2de824fd91d16c81ef0bf9e9f283910e97ffca | |
| parent | 62c117ec939dbcce5d190e3086d9f55c9db34f23 (diff) | |
Fix module dependencies of scxml
Commit 67d9d69b97 made qml a conditional dependency of a qtscxml module.
Anyhow, because qt_module.prf was included before the qml dependency
was added, the generated qt_libs_scxml.pri file didn't track this
dependency.
This lead to issues when examples were built against a Qt where
libQt5Scxml was not yet installed, and therefore libQt5Qml and
libQt5Network wasn't found.
Fixes: QTBUG-75383
Change-Id: Ieba5972a1509400aa145fc29b11fbba4c1d625fd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/scxml/scxml.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scxml/scxml.pro b/src/scxml/scxml.pro index c3a6aff..fe55769 100644 --- a/src/scxml/scxml.pro +++ b/src/scxml/scxml.pro @@ -2,8 +2,6 @@ TARGET = QtScxml QT = core-private MODULE_CONFIG += c++11 qscxmlc -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtscxml.qdocconf CONFIG += $$MODULE_CONFIG @@ -57,6 +55,8 @@ qtConfig(scxml-ecmascriptdatamodel) { qscxmlecmascriptplatformproperties.cpp } +load(qt_module) + FEATURES += ../../mkspecs/features/qscxmlc.prf features.files = $$FEATURES features.path = $$[QT_HOST_DATA]/mkspecs/features/ |