diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:08:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:08:29 +0100 |
| commit | a49c4f4cb16cd9e79ac97ab0178df0d9e49ec3f5 (patch) | |
| tree | d9ddccb98afc50c5b73c02deaa55237f2763e06f | |
| parent | f66312ce38e083d8c1873b7c61702b2e88f229b1 (diff) | |
| parent | a36ee0bd14f528238c8761265d934e29268e2dbe (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: If00801df901692a93d851f97715facd2b1a167a9
| -rw-r--r-- | examples/scxml/calculator-qml/calculator-qml.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/scxml/calculator-qml/calculator-qml.qml b/examples/scxml/calculator-qml/calculator-qml.qml index c7d8236..e4bb0b5 100644 --- a/examples/scxml/calculator-qml/calculator-qml.qml +++ b/examples/scxml/calculator-qml/calculator-qml.qml @@ -50,7 +50,7 @@ import CalculatorStateMachine 1.0 import QtQuick 2.5 -import QtQuick.Window 2.0 +import QtQuick.Window 2.2 import QtScxml 5.8 Window { |