diff options
author | Andras Mantia <andras@kdab.com> | 2017-11-22 16:42:55 +0200 |
---|---|---|
committer | Andras Mantia <andras@kdab.com> | 2017-12-19 07:46:37 +0000 |
commit | 7c7d61b8d032c7a6c6586cd3971c8d473eb326b7 (patch) | |
tree | 8ece2dec215894a6f0ac31adffbc8c9d3d1ea166 | |
parent | 71098c398f202e380409daf0d8a1814b90a53d02 (diff) |
Require newer QtQuick.Controls version
Change-Id: I0693aed6a06f85a3393d85c79a2e5d3b836696a7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
35 files changed, 36 insertions, 35 deletions
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.qml b/src/Authoring/Studio/Palettes/Action/ActionView.qml index c1debc3a..13d25c5b 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionView.qml +++ b/src/Authoring/Studio/Palettes/Action/ActionView.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import Qt3DStudio 1.0 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/EventsBrowser.qml b/src/Authoring/Studio/Palettes/Action/EventsBrowser.qml index cb751cdd..47baeec7 100644 --- a/src/Authoring/Studio/Palettes/Action/EventsBrowser.qml +++ b/src/Authoring/Studio/Palettes/Action/EventsBrowser.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerEmitSignal.qml b/src/Authoring/Studio/Palettes/Action/HandlerEmitSignal.qml index 5917a9bd..16eac96e 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerEmitSignal.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerEmitSignal.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerFireEvent.qml b/src/Authoring/Studio/Palettes/Action/HandlerFireEvent.qml index e92d2265..5b2ca0f6 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerFireEvent.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerFireEvent.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerGenericBaseColor.qml b/src/Authoring/Studio/Palettes/Action/HandlerGenericBaseColor.qml index 452af1ed..fb0bbc36 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerGenericBaseColor.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerGenericBaseColor.qml @@ -27,7 +27,8 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 +import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 import Qt.labs.platform 1.0 diff --git a/src/Authoring/Studio/Palettes/Action/HandlerGenericCheckbox.qml b/src/Authoring/Studio/Palettes/Action/HandlerGenericCheckbox.qml index 4b3b0ba4..8446f761 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerGenericCheckbox.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerGenericCheckbox.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerGenericColor.qml b/src/Authoring/Studio/Palettes/Action/HandlerGenericColor.qml index 7dc77f12..cad079ee 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerGenericColor.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerGenericColor.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerGenericText.qml b/src/Authoring/Studio/Palettes/Action/HandlerGenericText.qml index e33e170f..768a3354 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerGenericText.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerGenericText.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerGoToSlide.qml b/src/Authoring/Studio/Palettes/Action/HandlerGoToSlide.qml index ef76dfcb..08b5259c 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerGoToSlide.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerGoToSlide.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerMultilineText.qml b/src/Authoring/Studio/Palettes/Action/HandlerMultilineText.qml index 2913b3d4..e19e42d0 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerMultilineText.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerMultilineText.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml index b1cd19e8..ad016b86 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXY.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXY.qml index 3770be64..80ddca41 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXY.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXY.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXYZ.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXYZ.qml index cfcc0f79..d3190975 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXYZ.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseXYZ.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerPropertyCombo.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertyCombo.qml index 1e60cf44..445d4928 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerPropertyCombo.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertyCombo.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerPropertySlider.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertySlider.qml index aecdcfd4..2ecc34af 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerPropertySlider.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertySlider.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Action/HandlerPropertyXYZ.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertyXYZ.qml index bedae58e..6571f1d0 100644 --- a/src/Authoring/Studio/Palettes/Action/HandlerPropertyXYZ.qml +++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertyXYZ.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsView.qml b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsView.qml index 6fa1fb76..02080167 100644 --- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsView.qml +++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsView.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import "../controls" Rectangle { diff --git a/src/Authoring/Studio/Palettes/Inspector/ChooserDelegate.qml b/src/Authoring/Studio/Palettes/Inspector/ChooserDelegate.qml index 6ee4445c..e8adea7f 100644 --- a/src/Authoring/Studio/Palettes/Inspector/ChooserDelegate.qml +++ b/src/Authoring/Studio/Palettes/Inspector/ChooserDelegate.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Inspector/FileChooser.qml b/src/Authoring/Studio/Palettes/Inspector/FileChooser.qml index 2762af3a..b578417f 100644 --- a/src/Authoring/Studio/Palettes/Inspector/FileChooser.qml +++ b/src/Authoring/Studio/Palettes/Inspector/FileChooser.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Inspector/HandlerFilesChooser.qml b/src/Authoring/Studio/Palettes/Inspector/HandlerFilesChooser.qml index 65e0d6be..b1514d03 100644 --- a/src/Authoring/Studio/Palettes/Inspector/HandlerFilesChooser.qml +++ b/src/Authoring/Studio/Palettes/Inspector/HandlerFilesChooser.qml @@ -28,7 +28,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import "../controls" RowLayout { diff --git a/src/Authoring/Studio/Palettes/Inspector/HandlerGenericChooser.qml b/src/Authoring/Studio/Palettes/Inspector/HandlerGenericChooser.qml index 9a8f1688..15857584 100644 --- a/src/Authoring/Studio/Palettes/Inspector/HandlerGenericChooser.qml +++ b/src/Authoring/Studio/Palettes/Inspector/HandlerGenericChooser.qml @@ -28,7 +28,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import "../controls" RowLayout { diff --git a/src/Authoring/Studio/Palettes/Inspector/ImageChooser.qml b/src/Authoring/Studio/Palettes/Inspector/ImageChooser.qml index 7621c5ef..e6668a17 100644 --- a/src/Authoring/Studio/Palettes/Inspector/ImageChooser.qml +++ b/src/Authoring/Studio/Palettes/Inspector/ImageChooser.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Inspector/MeshChooser.qml b/src/Authoring/Studio/Palettes/Inspector/MeshChooser.qml index 229c4c8c..331051bc 100644 --- a/src/Authoring/Studio/Palettes/Inspector/MeshChooser.qml +++ b/src/Authoring/Studio/Palettes/Inspector/MeshChooser.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectBrowser.qml b/src/Authoring/Studio/Palettes/Inspector/ObjectBrowser.qml index 299a4757..36acbd91 100644 --- a/src/Authoring/Studio/Palettes/Inspector/ObjectBrowser.qml +++ b/src/Authoring/Studio/Palettes/Inspector/ObjectBrowser.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import Qt3DStudio 1.0 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Inspector/TextureChooser.qml b/src/Authoring/Studio/Palettes/Inspector/TextureChooser.qml index 4f90640e..20754b5b 100644 --- a/src/Authoring/Studio/Palettes/Inspector/TextureChooser.qml +++ b/src/Authoring/Studio/Palettes/Inspector/TextureChooser.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Project/ProjectView.qml b/src/Authoring/Studio/Palettes/Project/ProjectView.qml index 2ee79a8d..f4f84595 100644 --- a/src/Authoring/Studio/Palettes/Project/ProjectView.qml +++ b/src/Authoring/Studio/Palettes/Project/ProjectView.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../controls" diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.qml b/src/Authoring/Studio/Palettes/Slide/SlideView.qml index 1d9e5cc7..1d7670f6 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.qml +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import "../controls" Rectangle { diff --git a/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml b/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml index 4891cde7..f0089d22 100644 --- a/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml +++ b/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 MouseArea { diff --git a/src/Authoring/Studio/Palettes/controls/FloatTextField.qml b/src/Authoring/Studio/Palettes/controls/FloatTextField.qml index b046e329..25680090 100644 --- a/src/Authoring/Studio/Palettes/controls/FloatTextField.qml +++ b/src/Authoring/Studio/Palettes/controls/FloatTextField.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 /* Use for: Position, Rotation, Scale, Pivot ... */ diff --git a/src/Authoring/Studio/Palettes/controls/StyledLabel.qml b/src/Authoring/Studio/Palettes/controls/StyledLabel.qml index 02016069..5185b2ad 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledLabel.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledLabel.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 Label { diff --git a/src/Authoring/Studio/Palettes/controls/StyledMenuItem.qml b/src/Authoring/Studio/Palettes/controls/StyledMenuItem.qml index 361d5876..e44b733f 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledMenuItem.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledMenuItem.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 MenuItem { diff --git a/src/Authoring/Studio/Palettes/controls/StyledMenuSeparator.qml b/src/Authoring/Studio/Palettes/controls/StyledMenuSeparator.qml index 532fee2c..0fce5d0d 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledMenuSeparator.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledMenuSeparator.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 MenuSeparator { id: control diff --git a/src/Authoring/Studio/Palettes/controls/StyledTextField.qml b/src/Authoring/Studio/Palettes/controls/StyledTextField.qml index a46a5f07..04f1b259 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledTextField.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledTextField.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 TextField { diff --git a/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml b/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml index 6399f68b..fa775579 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 ToolButton { id: control diff --git a/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml b/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml index cae9c59f..3b29992a 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 ToolTip { id: control |