diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 16:23:09 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 16:23:33 +0200 |
| commit | 32f10df75c789477091770ae01bb26643a66fd87 (patch) | |
| tree | c81c80651a1672c24eddbe37e3df56deba23d5b4 /src | |
| parent | b2bb5fdc0bc3ac7a20b26b1f423245548cd6a4b6 (diff) | |
| parent | 8b133a964d0a7398791b6e14ad15f0f7284100dd (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml.
Change-Id: I7d1b06564b6b5c71882fe058f094894af7cb3efc
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/scxmlstatemachine/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/scxml/doc/qtscxml.qdocconf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/scxmlstatemachine/plugins.qmltypes b/src/imports/scxmlstatemachine/plugins.qmltypes index f0b5a20..1b6c469 100644 --- a/src/imports/scxmlstatemachine/plugins.qmltypes +++ b/src/imports/scxmlstatemachine/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtScxml 5.13' +// 'qmlplugindump -nonrelocatable QtScxml 5.14' Module { dependencies: ["QtQuick 2.0"] diff --git a/src/scxml/doc/qtscxml.qdocconf b/src/scxml/doc/qtscxml.qdocconf index 4902ae4..6d90bd1 100644 --- a/src/scxml/doc/qtscxml.qdocconf +++ b/src/scxml/doc/qtscxml.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtscxml.qdocconf) project = QtScxml description = Qt Scxml Reference Documentation |