From 7e54b75b8660c794d5e5ed5e252b4a87fa105c2b Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 27 Aug 2020 17:36:45 +0200 Subject: Native style: remove versioning from imports Change-Id: I73319d18ca6540227ce6bf4bdcf217a3c279c64c Reviewed-by: Mitch Curtis --- tests/manual/nativestyle/Buttons.qml | 6 +++--- tests/manual/nativestyle/CheckBoxes.qml | 6 +++--- tests/manual/nativestyle/ComboBoxes.qml | 6 +++--- tests/manual/nativestyle/ControlContainer.qml | 6 +++--- tests/manual/nativestyle/CustomButtons.qml | 6 +++--- tests/manual/nativestyle/CustomCheckBoxes.qml | 8 ++++---- tests/manual/nativestyle/CustomComboBoxes.qml | 8 ++++---- tests/manual/nativestyle/CustomDials.qml | 8 ++++---- tests/manual/nativestyle/CustomFrames.qml | 6 +++--- tests/manual/nativestyle/CustomProgressBars.qml | 8 ++++---- tests/manual/nativestyle/CustomRadioButtons.qml | 8 ++++---- tests/manual/nativestyle/CustomScrollBars.qml | 6 +++--- tests/manual/nativestyle/CustomSliders.qml | 6 +++--- tests/manual/nativestyle/CustomSpinBoxes.qml | 6 +++--- tests/manual/nativestyle/CustomTextAreas.qml | 6 +++--- tests/manual/nativestyle/CustomTextFields.qml | 6 +++--- tests/manual/nativestyle/Dials.qml | 6 +++--- tests/manual/nativestyle/Frames.qml | 6 +++--- tests/manual/nativestyle/ProgressBars.qml | 6 +++--- tests/manual/nativestyle/RadioButtons.qml | 8 ++++---- tests/manual/nativestyle/ScrollBars.qml | 6 +++--- tests/manual/nativestyle/Sliders.qml | 6 +++--- tests/manual/nativestyle/SlidersMini.qml | 6 +++--- tests/manual/nativestyle/SlidersSmall.qml | 6 +++--- tests/manual/nativestyle/SpinBoxes.qml | 6 +++--- tests/manual/nativestyle/TextAreas.qml | 6 +++--- tests/manual/nativestyle/TextFields.qml | 6 +++--- tests/manual/nativestyle/main.qml | 8 ++++---- 28 files changed, 91 insertions(+), 91 deletions(-) (limited to 'tests') diff --git a/tests/manual/nativestyle/Buttons.qml b/tests/manual/nativestyle/Buttons.qml index 2a11dea3..d5eb2a9c 100644 --- a/tests/manual/nativestyle/Buttons.qml +++ b/tests/manual/nativestyle/Buttons.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CheckBoxes.qml b/tests/manual/nativestyle/CheckBoxes.qml index 6c27adab..c24e9a54 100644 --- a/tests/manual/nativestyle/CheckBoxes.qml +++ b/tests/manual/nativestyle/CheckBoxes.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/ComboBoxes.qml b/tests/manual/nativestyle/ComboBoxes.qml index 37c6982c..21dd5b09 100644 --- a/tests/manual/nativestyle/ComboBoxes.qml +++ b/tests/manual/nativestyle/ComboBoxes.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/ControlContainer.qml b/tests/manual/nativestyle/ControlContainer.qml index 30022540..f528e994 100644 --- a/tests/manual/nativestyle/ControlContainer.qml +++ b/tests/manual/nativestyle/ControlContainer.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Item { anchors.left: parent.left diff --git a/tests/manual/nativestyle/CustomButtons.qml b/tests/manual/nativestyle/CustomButtons.qml index edcdb086..6a01faed 100644 --- a/tests/manual/nativestyle/CustomButtons.qml +++ b/tests/manual/nativestyle/CustomButtons.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomCheckBoxes.qml b/tests/manual/nativestyle/CustomCheckBoxes.qml index fcec932f..3bcb05e9 100644 --- a/tests/manual/nativestyle/CustomCheckBoxes.qml +++ b/tests/manual/nativestyle/CustomCheckBoxes.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Controls.impl ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomComboBoxes.qml b/tests/manual/nativestyle/CustomComboBoxes.qml index 58793182..2308509d 100644 --- a/tests/manual/nativestyle/CustomComboBoxes.qml +++ b/tests/manual/nativestyle/CustomComboBoxes.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 -import QtQuick.Controls.impl 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Controls.impl ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomDials.qml b/tests/manual/nativestyle/CustomDials.qml index e131548d..b9c614c1 100644 --- a/tests/manual/nativestyle/CustomDials.qml +++ b/tests/manual/nativestyle/CustomDials.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.Default.impl 2.12 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Default.impl +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomFrames.qml b/tests/manual/nativestyle/CustomFrames.qml index 0b74b220..e2b045a5 100644 --- a/tests/manual/nativestyle/CustomFrames.qml +++ b/tests/manual/nativestyle/CustomFrames.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/nativestyle/CustomProgressBars.qml index c6cffa23..c920d243 100644 --- a/tests/manual/nativestyle/CustomProgressBars.qml +++ b/tests/manual/nativestyle/CustomProgressBars.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 -import QtQuick.Controls.Default.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Controls.Default.impl ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomRadioButtons.qml b/tests/manual/nativestyle/CustomRadioButtons.qml index 9418b689..8a657cdd 100644 --- a/tests/manual/nativestyle/CustomRadioButtons.qml +++ b/tests/manual/nativestyle/CustomRadioButtons.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Controls.impl ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomScrollBars.qml b/tests/manual/nativestyle/CustomScrollBars.qml index fcac2eaf..07319952 100644 --- a/tests/manual/nativestyle/CustomScrollBars.qml +++ b/tests/manual/nativestyle/CustomScrollBars.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomSliders.qml b/tests/manual/nativestyle/CustomSliders.qml index 38cdf0a2..075c10d3 100644 --- a/tests/manual/nativestyle/CustomSliders.qml +++ b/tests/manual/nativestyle/CustomSliders.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomSpinBoxes.qml b/tests/manual/nativestyle/CustomSpinBoxes.qml index b632f311..b6de2b57 100644 --- a/tests/manual/nativestyle/CustomSpinBoxes.qml +++ b/tests/manual/nativestyle/CustomSpinBoxes.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomTextAreas.qml b/tests/manual/nativestyle/CustomTextAreas.qml index a729ea10..77e97b0c 100644 --- a/tests/manual/nativestyle/CustomTextAreas.qml +++ b/tests/manual/nativestyle/CustomTextAreas.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/CustomTextFields.qml b/tests/manual/nativestyle/CustomTextFields.qml index f781eb19..3e8ccd1e 100644 --- a/tests/manual/nativestyle/CustomTextFields.qml +++ b/tests/manual/nativestyle/CustomTextFields.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/Dials.qml b/tests/manual/nativestyle/Dials.qml index 56dff2a4..f0655f25 100644 --- a/tests/manual/nativestyle/Dials.qml +++ b/tests/manual/nativestyle/Dials.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/Frames.qml b/tests/manual/nativestyle/Frames.qml index 91cbec6d..220f8d03 100644 --- a/tests/manual/nativestyle/Frames.qml +++ b/tests/manual/nativestyle/Frames.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/ProgressBars.qml b/tests/manual/nativestyle/ProgressBars.qml index f19c05bd..8abd076d 100644 --- a/tests/manual/nativestyle/ProgressBars.qml +++ b/tests/manual/nativestyle/ProgressBars.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/RadioButtons.qml b/tests/manual/nativestyle/RadioButtons.qml index b9c49e7d..24a96b59 100644 --- a/tests/manual/nativestyle/RadioButtons.qml +++ b/tests/manual/nativestyle/RadioButtons.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Controls.impl ControlContainer { id: container diff --git a/tests/manual/nativestyle/ScrollBars.qml b/tests/manual/nativestyle/ScrollBars.qml index f7b78f86..a5764c78 100644 --- a/tests/manual/nativestyle/ScrollBars.qml +++ b/tests/manual/nativestyle/ScrollBars.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/Sliders.qml b/tests/manual/nativestyle/Sliders.qml index dba0794b..dcc6c79c 100644 --- a/tests/manual/nativestyle/Sliders.qml +++ b/tests/manual/nativestyle/Sliders.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/SlidersMini.qml b/tests/manual/nativestyle/SlidersMini.qml index 542719e9..4c7610c4 100644 --- a/tests/manual/nativestyle/SlidersMini.qml +++ b/tests/manual/nativestyle/SlidersMini.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/SlidersSmall.qml b/tests/manual/nativestyle/SlidersSmall.qml index bd1f85a6..04c9cb24 100644 --- a/tests/manual/nativestyle/SlidersSmall.qml +++ b/tests/manual/nativestyle/SlidersSmall.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/SpinBoxes.qml b/tests/manual/nativestyle/SpinBoxes.qml index 0b66e977..60e2213b 100644 --- a/tests/manual/nativestyle/SpinBoxes.qml +++ b/tests/manual/nativestyle/SpinBoxes.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/TextAreas.qml b/tests/manual/nativestyle/TextAreas.qml index f0406146..0e1573b0 100644 --- a/tests/manual/nativestyle/TextAreas.qml +++ b/tests/manual/nativestyle/TextAreas.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/TextFields.qml b/tests/manual/nativestyle/TextFields.qml index 75f2b720..10e97da5 100644 --- a/tests/manual/nativestyle/TextFields.qml +++ b/tests/manual/nativestyle/TextFields.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ControlContainer { id: container diff --git a/tests/manual/nativestyle/main.qml b/tests/manual/nativestyle/main.qml index 6cf7a646..f0575820 100644 --- a/tests/manual/nativestyle/main.qml +++ b/tests/manual/nativestyle/main.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.13 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts ApplicationWindow { visible: true -- cgit v1.2.3