Merge branch 'develop' into network

10 years ago · 228bcda870
4 changed files with 11 additions and 11 deletions
--- a/mix/qml/BasicContent.qml
+++ b/mix/qml/BasicContent.qml
@ -1,5 +1,5 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
+import QtQuick 2.2
+import QtQuick.Controls 1.1

 Rectangle {
 	anchors.fill: parent
--- a/mix/qml/MainContent.qml
+++ b/mix/qml/MainContent.qml
@ -1,7 +1,7 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
+import QtQuick 2.2
+import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.0
-import QtQuick.Controls.Styles 1.2
+import QtQuick.Controls.Styles 1.1
 import CodeEditorExtensionManager 1.0

 Rectangle {
--- a/mix/qml/TabStyle.qml
+++ b/mix/qml/TabStyle.qml
@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-import QtQuick.Controls.Styles 1.2
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1

 TabViewStyle {
 	frameOverlap: 1
--- a/mix/qml/main.qml
+++ b/mix/qml/main.qml
@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-import QtQuick.Controls.Styles 1.2
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
 import CodeEditorExtensionManager 1.0

 ApplicationWindow {