diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:01:22 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:01:22 +0200 |
commit | 68c9234b67ca0939fcf6607d87bda90b93170567 (patch) | |
tree | 393725dce76ea564aba48d88fd94a90eec0ffdc1 | |
parent | af42dc3a3279dca16cdbf9de29f8d09849e57f74 (diff) | |
parent | 80a9f4dfd078c4df1bc2c7fa279d637debfd672a (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I01a6583514a3483ea2706dfd9d70a3c15999969e
-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/ |