Merge branch 'dev' of github.com:CINPLA/neuronify into dev

CINPLA · Jun 23, 2017 · b8f5b04 · b8f5b04
2 parents 70258e9 + d949574
commit b8f5b04
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/qml/SoundBank.qml b/qml/SoundBank.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0
 import QtQuick.Window 2.1

diff --git a/qml/controls/BoundSlider.qml b/qml/controls/BoundSlider.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.6
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.1
 import QtQml 2.2
 import QtGraphicalEffects 1.0
 

diff --git a/qml/generators/ACClamp.qml b/qml/generators/ACClamp.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.1
 
 import Neuronify 1.0
 

diff --git a/qml/generators/CurrentClamp.qml b/qml/generators/CurrentClamp.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.1
 
 import Neuronify 1.0
 

diff --git a/qml/hud/ConnectionMenu.qml b/qml/hud/ConnectionMenu.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0
 import QtQuick.Window 2.1

diff --git a/qml/hud/CreationMenu.qml b/qml/hud/CreationMenu.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtGraphicalEffects 1.0
 
 import "../neurons"

diff --git a/qml/hud/MeterControls.qml b/qml/hud/MeterControls.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 
 import Neuronify 1.0

diff --git a/qml/hud/PlaybackControls.qml b/qml/hud/PlaybackControls.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
+import QtQuick.Controls 2.1
 
 import "qrc:/qml"
 import "qrc:/qml/style"

diff --git a/qml/hud/SensorControls.qml b/qml/hud/SensorControls.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import ".."
 import "../controls"

diff --git a/qml/menus/mainmenu/MainMenu.qml b/qml/menus/mainmenu/MainMenu.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 

diff --git a/qml/meters/Loudspeaker.qml b/qml/meters/Loudspeaker.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.0
 
 import QtQuick.Controls.Styles 1.0
 

diff --git a/qml/neurons/AdaptationNeuron.qml b/qml/neurons/AdaptationNeuron.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.0
 
 import Neuronify 1.0
 

diff --git a/qml/neurons/Neuron.qml b/qml/neurons/Neuron.qml
@@ -5,7 +5,7 @@ import "../hud"
 import "../paths"
 
 import Neuronify 1.0
-import QtQuick.Controls 1.3
+import QtQuick.Controls 2.1
 import QtQuick.Particles 2.0
 import QtGraphicalEffects 1.0
 

diff --git a/qml/neurons/NeuronControls.qml b/qml/neurons/NeuronControls.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.1
 

diff --git a/qml/sensors/Retina.qml b/qml/sensors/Retina.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.6
-import QtQuick.Controls 1.3
+import QtQuick.Controls 2.1
 import QtMultimedia 5.4
 import QtQuick.Window 2.0
 

diff --git a/qml/style/Style.qml b/qml/style/Style.qml
@@ -1,6 +1,6 @@
 pragma Singleton
 import QtQuick 2.6
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.1
 
 Item {
     id: root