Move all QML types to Qt/4.6 namespace.

Adjust examples and demos accordingly.
As per QT-558

28 files changed, 56 insertions, 0 deletions

diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml
index 8203710..db8ae7c 100644
--- a/demos/declarative/calculator/CalcButton.qml
+++ b/demos/declarative/calculator/CalcButton.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     property string operation
     property bool toggable : false
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 2a297ef..001730d 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: MainWindow;
     width: 320; height: 270; color: "black"
diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml
index 629dce8..f5024e5 100644
--- a/demos/declarative/contacts/Button.qml
+++ b/demos/declarative/contacts/Button.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: button
     width: 30
diff --git a/demos/declarative/contacts/Contact.qml b/demos/declarative/contacts/Contact.qml
index 50c9d1c..77189e9 100644
--- a/demos/declarative/contacts/Contact.qml
+++ b/demos/declarative/contacts/Contact.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: contactDetails
     anchors.fill: parent
diff --git a/demos/declarative/contacts/ContactField.qml b/demos/declarative/contacts/ContactField.qml
index 765dcbd..69401f9 100644
--- a/demos/declarative/contacts/ContactField.qml
+++ b/demos/declarative/contacts/ContactField.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: contactField
     clip: true
diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml
index c8bf932..a28fbbc 100644
--- a/demos/declarative/contacts/FieldText.qml
+++ b/demos/declarative/contacts/FieldText.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: fieldText
     height: 30
diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml
index 00bce34..d42d359 100644
--- a/demos/declarative/contacts/RemoveButton.qml
+++ b/demos/declarative/contacts/RemoveButton.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: removeButton
     width: 30
diff --git a/demos/declarative/contacts/SearchBar.qml b/demos/declarative/contacts/SearchBar.qml
index 3ee2665..b3faa9d 100644
--- a/demos/declarative/contacts/SearchBar.qml
+++ b/demos/declarative/contacts/SearchBar.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: searchBar
     color: "white"
diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml
index e773221..189a5d7 100644
--- a/demos/declarative/contacts/contacts.qml
+++ b/demos/declarative/contacts/contacts.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: contacts
     width: 240
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index f53a43b..9ff560a 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Flipable {
     id: Container
 
diff --git a/demos/declarative/flickr/content/LikeOMeter.qml b/demos/declarative/flickr/content/LikeOMeter.qml
index 61317ae..88a28b6 100644
--- a/demos/declarative/flickr/content/LikeOMeter.qml
+++ b/demos/declarative/flickr/content/LikeOMeter.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Container
 
diff --git a/demos/declarative/flickr/content/Loading.qml b/demos/declarative/flickr/content/Loading.qml
index 0a8a51a..ff2c829 100644
--- a/demos/declarative/flickr/content/Loading.qml
+++ b/demos/declarative/flickr/content/Loading.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Image {
     id: Loading; source: "pics/loading.png"; transformOrigin: "Center"
     rotation: NumberAnimation {
diff --git a/demos/declarative/flickr/content/MediaButton.qml b/demos/declarative/flickr/content/MediaButton.qml
index 49922f0..cbe4265 100644
--- a/demos/declarative/flickr/content/MediaButton.qml
+++ b/demos/declarative/flickr/content/MediaButton.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Container
 
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index 0f74295..a02f92d 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Container
 
diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml
index 743c45e..4b092ca 100644
--- a/demos/declarative/flickr/content/Progress.qml
+++ b/demos/declarative/flickr/content/Progress.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Progress;
 
diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml
index 551f0ea..25dca98 100644
--- a/demos/declarative/flickr/content/ScrollBar.qml
+++ b/demos/declarative/flickr/content/ScrollBar.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Container
 
diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml
index 931dfe3..4e88c1e 100644
--- a/demos/declarative/flickr/content/Slider.qml
+++ b/demos/declarative/flickr/content/Slider.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Slider; width: 400; height: 16
 
diff --git a/demos/declarative/flickr/content/Star.qml b/demos/declarative/flickr/content/Star.qml
index 0828bc0..5a6a95d 100644
--- a/demos/declarative/flickr/content/Star.qml
+++ b/demos/declarative/flickr/content/Star.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Container
     width: 24
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 7f45b1c..f498462 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 import "content"
 
 Item {
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index 95bca38..06b425c 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 import "content"
 
 Item {
diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml
index 5e998e8..28b7133 100644
--- a/demos/declarative/samegame/SameGame.qml
+++ b/demos/declarative/samegame/SameGame.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 import "content"
 
 Rect {
diff --git a/demos/declarative/samegame/content/BoomBlock.qml b/demos/declarative/samegame/content/BoomBlock.qml
index 9148e60..0f5d4da 100644
--- a/demos/declarative/samegame/content/BoomBlock.qml
+++ b/demos/declarative/samegame/content/BoomBlock.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item { id:block
     property bool dying: false
     property bool spawned: false
diff --git a/demos/declarative/samegame/content/FastBlock.qml b/demos/declarative/samegame/content/FastBlock.qml
index 5149911..15664a3 100644
--- a/demos/declarative/samegame/content/FastBlock.qml
+++ b/demos/declarative/samegame/content/FastBlock.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect { id:block
     //Note: These properties are the interface used to control the blocks
     property bool dying: false
diff --git a/demos/declarative/samegame/content/MediaButton.qml b/demos/declarative/samegame/content/MediaButton.qml
index 49922f0..cbe4265 100644
--- a/demos/declarative/samegame/content/MediaButton.qml
+++ b/demos/declarative/samegame/content/MediaButton.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     id: Container
 
diff --git a/demos/declarative/samegame/content/SameDialog.qml b/demos/declarative/samegame/content/SameDialog.qml
index a0718f2..86248a6 100644
--- a/demos/declarative/samegame/content/SameDialog.qml
+++ b/demos/declarative/samegame/content/SameDialog.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     property string text: "Hello World!"
     property int show: 0
diff --git a/demos/declarative/samegame/content/SpinBlock.qml b/demos/declarative/samegame/content/SpinBlock.qml
index 2597bfb..1e92d9e 100644
--- a/demos/declarative/samegame/content/SpinBlock.qml
+++ b/demos/declarative/samegame/content/SpinBlock.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item { id:block
     //Note: These properties are the interface used to control the blocks
     property bool dying: false
diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml
index 1734433..8b337cd 100644
--- a/demos/declarative/webbrowser/content/RectSoftShadow.qml
+++ b/demos/declarative/webbrowser/content/RectSoftShadow.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Item {
     Image {
         source: "pics/softshadow-left.sci"
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index d5416c6..d3a65db 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 import "content"
 
 Item {