summaryrefslogtreecommitdiff
path: root/src/dialogs
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-04-07 10:32:37 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-07 12:12:35 +0200
commita3d87642cdebb32793258b6fe87c590ee5ceb3a5 (patch)
tree7097f4db25db90cfcf51dd7176bfd6b6b343097e /src/dialogs
parent783da20117857dbc840b9863f2cb4227773b338c (diff)
downloadqtquickcontrols-a3d87642cdebb32793258b6fe87c590ee5ceb3a5.tar.gz
Import QtQuick 2.2
Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/DefaultColorDialog.qml2
-rw-r--r--src/dialogs/DefaultDialogWrapper.qml2
-rw-r--r--src/dialogs/DefaultFileDialog.qml2
-rw-r--r--src/dialogs/DefaultFontDialog.qml2
-rw-r--r--src/dialogs/DefaultMessageDialog.qml2
-rw-r--r--src/dialogs/WidgetColorDialog.qml2
-rw-r--r--src/dialogs/WidgetFileDialog.qml2
-rw-r--r--src/dialogs/WidgetMessageDialog.qml2
-rw-r--r--src/dialogs/qml/ColorSlider.qml2
-rw-r--r--src/dialogs/qml/DefaultWindowDecoration.qml2
-rw-r--r--src/dialogs/qquickplatformcolordialog.cpp2
-rw-r--r--src/dialogs/qquickplatformfiledialog.cpp2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml
index 1b5f7485..14e1323e 100644
--- a/src/dialogs/DefaultColorDialog.qml
+++ b/src/dialogs/DefaultColorDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.0
import QtQuick.Window 2.1
diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml
index 2cf157ab..06777141 100644
--- a/src/dialogs/DefaultDialogWrapper.qml
+++ b/src/dialogs/DefaultDialogWrapper.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml
index aa9efddf..767939b3 100644
--- a/src/dialogs/DefaultFileDialog.qml
+++ b/src/dialogs/DefaultFileDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0 as ControlsPrivate
import QtQuick.Dialogs 1.1
diff --git a/src/dialogs/DefaultFontDialog.qml b/src/dialogs/DefaultFontDialog.qml
index 881bf664..2518ce95 100644
--- a/src/dialogs/DefaultFontDialog.qml
+++ b/src/dialogs/DefaultFontDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Dialogs 1.1
diff --git a/src/dialogs/DefaultMessageDialog.qml b/src/dialogs/DefaultMessageDialog.qml
index 0b46f9f3..932dbfe3 100644
--- a/src/dialogs/DefaultMessageDialog.qml
+++ b/src/dialogs/DefaultMessageDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.1
diff --git a/src/dialogs/WidgetColorDialog.qml b/src/dialogs/WidgetColorDialog.qml
index ed7c7ab7..c22cb558 100644
--- a/src/dialogs/WidgetColorDialog.qml
+++ b/src/dialogs/WidgetColorDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.PrivateWidgets 1.0
QtColorDialog { }
diff --git a/src/dialogs/WidgetFileDialog.qml b/src/dialogs/WidgetFileDialog.qml
index c8f59d20..228f84e8 100644
--- a/src/dialogs/WidgetFileDialog.qml
+++ b/src/dialogs/WidgetFileDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.PrivateWidgets 1.0
QtFileDialog { }
diff --git a/src/dialogs/WidgetMessageDialog.qml b/src/dialogs/WidgetMessageDialog.qml
index 8bc3eccf..88a40d59 100644
--- a/src/dialogs/WidgetMessageDialog.qml
+++ b/src/dialogs/WidgetMessageDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.PrivateWidgets 1.1
QtMessageDialog { }
diff --git a/src/dialogs/qml/ColorSlider.qml b/src/dialogs/qml/ColorSlider.qml
index 8fc97173..219da0cb 100644
--- a/src/dialogs/qml/ColorSlider.qml
+++ b/src/dialogs/qml/ColorSlider.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
Item {
id: colorSlider
diff --git a/src/dialogs/qml/DefaultWindowDecoration.qml b/src/dialogs/qml/DefaultWindowDecoration.qml
index ec930101..64eb4387 100644
--- a/src/dialogs/qml/DefaultWindowDecoration.qml
+++ b/src/dialogs/qml/DefaultWindowDecoration.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
Rectangle {
color: "#80000000"
diff --git a/src/dialogs/qquickplatformcolordialog.cpp b/src/dialogs/qquickplatformcolordialog.cpp
index 9e4083c8..01430a50 100644
--- a/src/dialogs/qquickplatformcolordialog.cpp
+++ b/src/dialogs/qquickplatformcolordialog.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
chooses a color:
\qml
- import QtQuick 2.1
+ import QtQuick 2.2
import QtQuick.Dialogs 1.0
ColorDialog {
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index 99bfc392..5a969adb 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
chooses a file:
\qml
- import QtQuick 2.1
+ import QtQuick 2.2
import QtQuick.Dialogs 1.0
FileDialog {
View Lorry Controller Status