From: Alan Alpert Date: Mon, 28 Nov 2011 03:16:59 +0000 (+1000) Subject: Update to QtQuick 2.0 X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5587885a71b962eb9443c1f83e3e477490bd691d;p=konrad%2Fqtdeclarative.git Update to QtQuick 2.0 Note that the plugin only exposes QObject types, not QDeclarativeItem. Change-Id: I817d143f762239e32456a7ac8fcca29c483a4f8e Reviewed-by: Michael Brasser --- diff --git a/examples/tutorials/gettingStarted/gsQml/core/Button.qml b/examples/tutorials/gettingStarted/gsQml/core/Button.qml index 1b53b77..5bd404f 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/Button.qml +++ b/examples/tutorials/gettingStarted/gsQml/core/Button.qml @@ -39,7 +39,7 @@ ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { //identifier of the item diff --git a/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml index 00729a7..3db560a 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: editMenu diff --git a/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml index 52c00b5..fbb91df 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml +++ b/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id:dialog diff --git a/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml index e8990dc..9fc37f7 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import "../filedialog" 1.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml index 4c4b712..2403485 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml +++ b/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: menuBar diff --git a/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml b/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml index bf7b0be..6e6345e 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml +++ b/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id:textArea diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml b/examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml index 1462b6c..a0d1009 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //! [document] -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: simplebutton diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml b/examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml index 540f31b..2e5a0e9 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml index c4afc6e..33c9521 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: editMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml index 0bb0144..3702061 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: fileMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml b/examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml index 7247a90..ac5edcd 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml b/examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml index 54f5b2c..38ace15 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml index cb83ec4..0c3e005 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: editMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml index 3d89fbf..2ebb992 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: fileMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml b/examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml index 69e8906..54fd23e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: menuBar diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml b/examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml index 54f5b2c..38ace15 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml index cb83ec4..0c3e005 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: editMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml index 3d89fbf..2ebb992 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: fileMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml b/examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml index 69e8906..54fd23e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: menuBar diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml b/examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml index 8fc8d4e..426f034 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id:textArea diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml b/examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml index 75890fa..245ba97 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml b/examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml index 706c889..2fc2824 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml index a286799..99f1d45 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: editMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml index 70ead34..06e8022 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: fileMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml b/examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml index ce42275..857b6c3 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: menuBar diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml b/examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml index 31eac2e..a85910e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: simplebutton diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml b/examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml index 28af5a5..2ba47c8 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id:textArea diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml b/examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml index 4279df0..20d60e6 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: screen diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml index 3daedc8..35174b7 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml index 7687fd7..dd72591 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: editMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml index f1b1e84..4268ca1 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id:dialog diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml index edcb3da..b57baad 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import "../filedialog" 1.0 Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml index d56f833..42e2280 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: menuBar diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml index 0a9cb51..838df7a 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id:textArea diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/textEditor.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/textEditor.qml index 8c5bcf2..07bce8c 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/textEditor.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/textEditor.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import "core" Rectangle { diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml index 20fc9c2..186c298 100644 --- a/examples/tutorials/gettingStarted/gsQml/texteditor.qml +++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import "core" Rectangle {