diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:45 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:46 +0100 |
| commit | 86f09add213e5067602f4bdf0cf659d693f03918 (patch) | |
| tree | 38eda1246edccab49bd4ecc952f8ea887983c3a1 /examples/quickcontrols2/imagine/automotive | |
| parent | 05597ef3e576a7cc09d193cb46dba490b7886ec1 (diff) | |
| parent | d3545dbdfdb30e310c6c962ba92f4fdf57354666 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
Diffstat (limited to 'examples/quickcontrols2/imagine/automotive')
4 files changed, 10 insertions, 10 deletions
diff --git a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml index dfd66ada..483059ae 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.12 Glow { color: glowColor diff --git a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml index e19d8665..d86b39c7 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Button { id: button diff --git a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml index 50f816ce..088e9c16 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 // This container and the transform on the Label are // necessary to get precise bounding rect of the text for layouting reasons, diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml index 86355bb0..91e3bf7c 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 import QtQuick.Window 2.0 ApplicationWindow { |