diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-11-28 13:16:59 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-29 03:29:53 +0100 |
commit | 5587885a71b962eb9443c1f83e3e477490bd691d (patch) | |
tree | e44a672de25f28baa4016356ae9698a5615dd898 | |
parent | ea2f93567f2d37ffdf6d8462be8a21e8640a2b76 (diff) |
Update to QtQuick 2.0
Note that the plugin only exposes QObject types, not QDeclarativeItem.
Change-Id: I817d143f762239e32456a7ac8fcca29c483a4f8e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
36 files changed, 36 insertions, 36 deletions
diff --git a/examples/tutorials/gettingStarted/gsQml/core/Button.qml b/examples/tutorials/gettingStarted/gsQml/core/Button.qml index 1b53b77774..5bd404f2c5 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 00729a737c..3db560a996 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 52c00b5e5c..fbb91dfead 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 e8990dc37c..9fc37f79b9 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 4c4b71263a..24034855fa 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 bf7b0beb70..6e6345edfd 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 1462b6c5d9..a0d10095a5 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 540f31beec..2e5a0e9327 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 c4afc6edb3..33c952147c 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 0bb01447f3..3702061c29 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 7247a90c53..ac5edcd120 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 54f5b2ca06..38ace1535e 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 cb83ec4b8a..0c3e0057fc 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 3d89fbf880..2ebb992297 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 69e890669a..54fd23e6f2 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 54f5b2ca06..38ace1535e 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 cb83ec4b8a..0c3e0057fc 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 3d89fbf880..2ebb992297 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 69e890669a..54fd23e6f2 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 8fc8d4e1aa..426f03427d 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 75890fa209..245ba97d68 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 706c8897bc..2fc282451a 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 a28679929a..99f1d458da 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 70ead34b44..06e802283c 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 ce42275232..857b6c392d 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 31eac2e334..a85910ebda 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 28af5a5039..2ba47c896f 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 4279df09a6..20d60e626b 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 3daedc8a76..35174b78f3 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 7687fd7f56..dd7259156c 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 f1b1e849e9..4268ca1426 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 edcb3da794..b57baadc4c 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 d56f833638..42e2280bf0 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 0a9cb5121b..838df7a435 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 8c5bcf2be8..07bce8c33e 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 20fc9c2035..186c2983e9 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 { |