diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-01-23 16:31:01 +0200 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-01-29 09:41:50 +0200 |
| commit | 35ea838b469e95825a7e34651724f609ca2202c9 (patch) | |
| tree | 23551d5e484881e2edfd7bc0d1c0ff9ddda84852 /examples | |
| parent | 4d7f93c807447fadb7119f77a233702a71c3f5b1 (diff) | |
QML versioning and registration update for QtScxml
The main changes:
-QML element versioning so that “import QtScxml” works
from version 5.8 to latest 6.x
-QML element registration to use the newish QML_ELEMENT and friends
-Automatic plugins.qmltypes generation during build
Task-number: QTBUG-89832
Change-Id: If6b031fbbe4b4143f4fad626c9a71f55e571491a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples')
5 files changed, 12 insertions, 12 deletions
diff --git a/examples/scxml/calculator-qml/calculator-qml.qml b/examples/scxml/calculator-qml/calculator-qml.qml index e4bb0b5..59b6d26 100644 --- a/examples/scxml/calculator-qml/calculator-qml.qml +++ b/examples/scxml/calculator-qml/calculator-qml.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import CalculatorStateMachine 1.0 -import QtQuick 2.5 -import QtQuick.Window 2.2 -import QtScxml 5.8 +import CalculatorStateMachine +import QtQuick +import QtQuick.Window +import QtScxml Window { id: window diff --git a/examples/scxml/invoke-common/MainView.qml b/examples/scxml/invoke-common/MainView.qml index 8d8c3e3..07ce15b 100644 --- a/examples/scxml/invoke-common/MainView.qml +++ b/examples/scxml/invoke-common/MainView.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Window 2.2 -import QtScxml 5.8 +import QtQuick +import QtQuick.Window +import QtScxml Window { id: window diff --git a/examples/scxml/invoke-dynamic/invoke-dynamic.qml b/examples/scxml/invoke-dynamic/invoke-dynamic.qml index 4ff85b4..5457c78 100644 --- a/examples/scxml/invoke-dynamic/invoke-dynamic.qml +++ b/examples/scxml/invoke-dynamic/invoke-dynamic.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtScxml 5.8 +import QtScxml MainView { stateMachine: directions.stateMachine diff --git a/examples/scxml/mediaplayer-common/Mediaplayer.qml b/examples/scxml/mediaplayer-common/Mediaplayer.qml index 42a948a..51d162d 100644 --- a/examples/scxml/mediaplayer-common/Mediaplayer.qml +++ b/examples/scxml/mediaplayer-common/Mediaplayer.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Window 2.2 -import QtScxml 5.8 +import QtQuick +import QtQuick.Window +import QtScxml Window { id: root diff --git a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml index aef249a..9ce9e41 100644 --- a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtScxml 5.8 +import QtScxml TrafficLight { StateMachineLoader { |