summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-02 16:47:06 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-02 16:47:07 +0200
commit01bc8df0760e14449ca7d5b6c187bf9870efbd3d (patch)
treeeea62b9e3a254d9ac967ff62ee1ef18f809d434c
parent613d7e6a7e49a0dea4a0262c81d14ec51c6309fd (diff)
parent68c9234b67ca0939fcf6607d87bda90b93170567 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--src/scxml/scxml.pro4
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/