chore: Normalize imports to Qt 5.4

danian-hn · Oct 29, 2015 · 3c9f4e1 · 3c9f4e1
1 parent 7ecc219
commit 3c9f4e1
Show file tree

Hide file tree

Showing 106 changed files with 135 additions and 135 deletions.
diff --git a/demo/BottomSheetDemo.qml b/demo/BottomSheetDemo.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import Material.ListItems 0.1
 

diff --git a/demo/ButtonDemo.qml b/demo/ButtonDemo.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
-import QtQuick.Controls 1.2 as Controls
+import QtQuick.Controls 1.3 as Controls
 
 Item {
 

diff --git a/demo/CheckBoxDemo.qml b/demo/CheckBoxDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 

diff --git a/demo/ColorPaletteDemo.qml b/demo/ColorPaletteDemo.qml
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 

diff --git a/demo/CustomIconsDemo.qml b/demo/CustomIconsDemo.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import Material.ListItems 0.1 as ListItem
 

diff --git a/demo/DatePickerDemo.qml b/demo/DatePickerDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 import Material.ListItems 0.1 as ListItem

diff --git a/demo/DialogDemo.qml b/demo/DialogDemo.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import QtQuick.Controls 1.2 as QuickControls
+import QtQuick 2.4
+import QtQuick.Controls 1.3 as QuickControls
 import Material 0.1
 import Material.Extras 0.1
 

diff --git a/demo/FormsDemo.qml b/demo/FormsDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 import Material.ListItems 0.1 as ListItem

diff --git a/demo/IconsDemo.qml b/demo/IconsDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import Material.ListItems 0.1 as ListItem
 import Material.Extras 0.1

diff --git a/demo/ListItemsDemo.qml b/demo/ListItemsDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import Material.ListItems 0.1 as ListItem
 import Material.Extras 0.1

diff --git a/demo/PageStackDemo.qml b/demo/PageStackDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import Material.Extras 0.1
 

diff --git a/demo/ProgressBarDemo.qml b/demo/ProgressBarDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 

diff --git a/demo/RadioButtonDemo.qml b/demo/RadioButtonDemo.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2 as QuickControls
+import QtQuick.Controls 1.3 as QuickControls
 import Material 0.1
 
 ColumnLayout {

diff --git a/demo/SliderDemo.qml b/demo/SliderDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 

diff --git a/demo/SubPage.qml b/demo/SubPage.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.2
+import QtQuick 2.4
 import Material 0.1
 import Material.ListItems 0.1 as ListItem
 

diff --git a/demo/SwitchDemo.qml b/demo/SwitchDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 

diff --git a/demo/TextFieldDemo.qml b/demo/TextFieldDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 

diff --git a/demo/TimePickerDemo.qml b/demo/TimePickerDemo.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 
 

diff --git a/demo/main.qml b/demo/main.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.2
+import QtQuick 2.4
 import Material 0.1
 import Material.ListItems 0.1 as ListItem
 

diff --git a/modules/Material/Action.qml b/modules/Material/Action.qml
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import QtQuick.Controls 1.2 as Controls
+import QtQuick 2.4
+import QtQuick.Controls 1.3 as Controls
 /*!
    \qmltype Action
    \inqmlmodule Material 0.1

diff --git a/modules/Material/ActionBar.qml b/modules/Material/ActionBar.qml
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 import Material.Extras 0.1

diff --git a/modules/Material/ActionButton.qml b/modules/Material/ActionButton.qml
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import QtQuick.Controls 1.2 as Controls
-import QtQuick.Controls.Styles 1.2 as ControlStyles
+import QtQuick 2.4
+import QtQuick.Controls 1.3 as Controls
+import QtQuick.Controls.Styles 1.3 as ControlStyles
 import Material 0.1
 import QtGraphicalEffects 1.0
 

diff --git a/modules/Material/AppTheme.qml b/modules/Material/AppTheme.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 
 /*!

diff --git a/modules/Material/ApplicationWindow.qml b/modules/Material/ApplicationWindow.qml
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import QtQuick.Controls 1.2 as Controls
-import QtQuick.Window 2.0
+import QtQuick 2.4
+import QtQuick.Controls 1.3 as Controls
+import QtQuick.Window 2.2
 import Material 0.1
 import Material.Extras 0.1
 
@@ -33,7 +33,7 @@ import Material.Extras 0.1
    Here is a short working example of an application:
 
    \qml
-   import QtQuick 2.0
+   import QtQuick 2.4
    import Material 0.1
 
    ApplicationWindow {

diff --git a/modules/Material/AwesomeIcon.qml b/modules/Material/AwesomeIcon.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import 'awesome.js' as Awesome
 

diff --git a/modules/Material/BottomActionSheet.qml b/modules/Material/BottomActionSheet.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import Material.ListItems 0.1 as ListItem
 

diff --git a/modules/Material/BottomSheet.qml b/modules/Material/BottomSheet.qml
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 
 /*!

diff --git a/modules/Material/Button.qml b/modules/Material/Button.qml
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import QtQuick.Controls 1.2 as Controls
+import QtQuick 2.4
+import QtQuick.Controls 1.3 as Controls
 import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
 import Material 0.1
 

diff --git a/modules/Material/Card.qml b/modules/Material/Card.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 
 /*!

diff --git a/modules/Material/CheckBox.qml b/modules/Material/CheckBox.qml
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import QtQuick.Controls 1.2 as Controls
+import QtQuick 2.4
+import QtQuick.Controls 1.3 as Controls
 import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
 import Material 0.1
 

diff --git a/modules/Material/DatePicker.qml b/modules/Material/DatePicker.qml
@@ -20,7 +20,7 @@ import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 1.3 as Controls
 import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-import QtQuick.Controls.Styles 1.2
+import QtQuick.Controls.Styles 1.3
 import QtQuick.Controls.Private 1.0
 import Material 0.1
 

diff --git a/modules/Material/Device.qml b/modules/Material/Device.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 
 pragma Singleton
 

diff --git a/modules/Material/Dialog.qml b/modules/Material/Dialog.qml
@@ -18,7 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Material 0.1
 import Material.Extras 0.1

diff --git a/modules/Material/Dropdown.qml b/modules/Material/Dropdown.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Window 2.2
 import Material 0.1
 import Material.Extras 0.1

diff --git a/modules/Material/Extras/AutomaticGrid.qml b/modules/Material/Extras/AutomaticGrid.qml
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Grid {
     id: grid

diff --git a/modules/Material/Extras/CircleImage.qml b/modules/Material/Extras/CircleImage.qml
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Material.Extras 0.1 as Extras
 import QtGraphicalEffects 1.0
 

diff --git a/modules/Material/Extras/CircleMask.qml b/modules/Material/Extras/CircleMask.qml
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtGraphicalEffects 1.0
 
 Item {

diff --git a/modules/Material/Extras/ColumnFlow.qml b/modules/Material/Extras/ColumnFlow.qml
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*
 example usage:

diff --git a/modules/Material/Extras/Document.qml b/modules/Material/Extras/Document.qml
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Object {
     id: document

diff --git a/modules/Material/Extras/Image.qml b/modules/Material/Extras/Image.qml
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 Image {
   id: image

diff --git a/modules/Material/Extras/Object.qml b/modules/Material/Extras/Object.qml
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 QtObject {
     id: object

diff --git a/modules/Material/Extras/js/httplib.js b/modules/Material/Extras/js/httplib.js
@@ -61,7 +61,7 @@ function request(path, call, args, timeout) {
 
     if(timeout !== undefined) {
         console.log("Creating timer.");
-        timer = Qt.createQmlObject("import QtQuick 2.3; Timer {interval: " + timeout + "; repeat: false; running: true;}", Qt.application, "XHRTimer");
+        timer = Qt.createQmlObject("import QtQuick 2.4; Timer {interval: " + timeout + "; repeat: false; running: true;}", Qt.application, "XHRTimer");
         timer.triggered.connect(function() {
             doc.hasTimeout = true;
             doc.abort();

diff --git a/modules/Material/Extras/js/utils.js b/modules/Material/Extras/js/utils.js
@@ -18,7 +18,7 @@
  */
 
 .pragma library
-.import QtQuick 2.0 as QtQuick
+.import QtQuick 2.4 as QtQuick
 
 function generateID() {
     var guid = (function() {

diff --git a/modules/Material/Icon.qml b/modules/Material/Icon.qml
@@ -16,8 +16,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import QtQuick.Window 2.0
+import QtQuick 2.4
+import QtQuick.Window 2.2
 import Material 0.1
 import QtGraphicalEffects 1.0
 

diff --git a/modules/Material/IconButton.qml b/modules/Material/IconButton.qml
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 import Material 0.1
 import Material.Extras 0.1