Using Quick.Controls 1.4 instead of 2.0 for Qt5.6 support

CINPLA · Nov 3, 2016 · 5d71c09 · 5d71c09
1 parent 047feb0
commit 5d71c09
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 4 deletions.
diff --git a/QmlPreviewerButton.qml b/QmlPreviewerButton.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.0
+import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.2
 import QtGraphicalEffects 1.0

diff --git a/QmlPreviewerDialog.qml b/QmlPreviewerDialog.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.0
+import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.2
 import Qt.labs.settings 1.0

diff --git a/ios/iOS.plist b/ios/iOS.plist
@@ -57,7 +57,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.94.7</string>
+	<string>0.94.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/libs/CuteVersioning b/libs/CuteVersioning
diff --git a/qml/Neuronify.qml b/qml/Neuronify.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.5
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.4
 import QtQuick.Dialogs 1.0
 import QtQuick.Layouts 1.1
 import QtQuick.Particles 2.0

diff --git a/qml/main.qml b/qml/main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.0
 import Qt.labs.settings 1.0
 import CuteVersioning 1.0

diff --git a/qml/store/Store.qml b/qml/store/Store.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.7
+import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.0
 
 Item {

diff --git a/qml/store/StoreFrontPage.qml b/qml/store/StoreFrontPage.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.4
+import QtQuick.Controls 1.4
 
 Item {
     width: 400