diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 00:15:14 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 00:15:14 (GMT) |
| commit | dc602e3b9c4d5e4da1d57ed657d82e73401b4531 (patch) | |
| tree | 6f1ec1972a6dbeea0830373fe534390da06e6869 | |
| parent | 8dc527a3837c937630c8bbbab034b8bc84d496fb (diff) | |
| download | Qt-dc602e3b9c4d5e4da1d57ed657d82e73401b4531.zip Qt-dc602e3b9c4d5e4da1d57ed657d82e73401b4531.tar.gz Qt-dc602e3b9c4d5e4da1d57ed657d82e73401b4531.tar.bz2 | |
Move all QML types to Qt/4.6 namespace.
Adjust examples and demos accordingly.
As per QT-558
291 files changed, 590 insertions, 113 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 { diff --git a/doc/src/snippets/declarative/GroupBox.qml b/doc/src/snippets/declarative/GroupBox.qml index fd8d60b..efbe4e5 100644 --- a/doc/src/snippets/declarative/GroupBox.qml +++ b/doc/src/snippets/declarative/GroupBox.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + ContentWrapper { id: Container; width: parent.width; height: contents.height children: [ diff --git a/doc/src/snippets/declarative/comments.qml b/doc/src/snippets/declarative/comments.qml index 22e0d18..4f8a442 100644 --- a/doc/src/snippets/declarative/comments.qml +++ b/doc/src/snippets/declarative/comments.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Text { text: "Hello world!" //a basic greeting /* diff --git a/doc/src/snippets/declarative/content.qml b/doc/src/snippets/declarative/content.qml index 6f9e0d8..1e01b29 100644 --- a/doc/src/snippets/declarative/content.qml +++ b/doc/src/snippets/declarative/content.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 200; height: 100; color: "lightgray" GroupBox { diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml index 3a573ad..2191b6f 100644 --- a/doc/src/snippets/declarative/drag.qml +++ b/doc/src/snippets/declarative/drag.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [0] Rect { id: blurtest; width: 600; height: 200; color: "white" diff --git a/doc/src/snippets/declarative/gradient.qml b/doc/src/snippets/declarative/gradient.qml index 28018b8..19923ac 100644 --- a/doc/src/snippets/declarative/gradient.qml +++ b/doc/src/snippets/declarative/gradient.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 100; height: 100 gradient: Gradient { diff --git a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml b/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml index accbc3e..6868385 100644 --- a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml +++ b/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + ListModel { id: ContactModel ListElement { diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml index 0fca789..208118d 100644 --- a/doc/src/snippets/declarative/gridview/gridview.qml +++ b/doc/src/snippets/declarative/gridview/gridview.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [3] Rect { width: 240; height: 180; color: "white" diff --git a/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml b/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml index 53c745e..31e02ea 100644 --- a/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml +++ b/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + ListModel { id: ContactModel ListElement { diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml index e3c948e..3d13170 100644 --- a/doc/src/snippets/declarative/listview/highlight.qml +++ b/doc/src/snippets/declarative/listview/highlight.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 180; height: 200; color: "white" diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml index 21a5fce..50677ba 100644 --- a/doc/src/snippets/declarative/listview/listview.qml +++ b/doc/src/snippets/declarative/listview/listview.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [3] Rect { width: 180; height: 200; color: "white" diff --git a/doc/src/snippets/declarative/mouseregion.qml b/doc/src/snippets/declarative/mouseregion.qml index 5c1afe6..d3e22cd 100644 --- a/doc/src/snippets/declarative/mouseregion.qml +++ b/doc/src/snippets/declarative/mouseregion.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 200; height: 100 HorizontalLayout { //! [0] diff --git a/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml b/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml index 44cdaf0..20b3b7d 100644 --- a/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml +++ b/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + ListModel { id: MenuModel ListElement { diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml index 44789f2..39c7122 100644 --- a/doc/src/snippets/declarative/pathview/pathattributes.qml +++ b/doc/src/snippets/declarative/pathview/pathattributes.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240; height: 200; color: 'white' //! [0] diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml index 11df0a2..70f498c 100644 --- a/doc/src/snippets/declarative/pathview/pathview.qml +++ b/doc/src/snippets/declarative/pathview/pathview.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240; height: 200; color: 'white' //! [0] diff --git a/doc/src/snippets/declarative/repeater.qml b/doc/src/snippets/declarative/repeater.qml index c8f9f18..a58972f 100644 --- a/doc/src/snippets/declarative/repeater.qml +++ b/doc/src/snippets/declarative/repeater.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [0] Rect { width: 220; height: 20; color: "white" Component { id: Dot diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml index 01838dd..c7e184f 100644 --- a/doc/src/snippets/declarative/rotation.qml +++ b/doc/src/snippets/declarative/rotation.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 360; height: 80 color: "white" diff --git a/examples/declarative/animation/animation.qml b/examples/declarative/animation/animation.qml index 37e68d6..2ea6616 100644 --- a/examples/declarative/animation/animation.qml +++ b/examples/declarative/animation/animation.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 400 height: 200 diff --git a/examples/declarative/aspectratio/face_fit.qml b/examples/declarative/aspectratio/face_fit.qml index 3005d1b..95105e1 100644 --- a/examples/declarative/aspectratio/face_fit.qml +++ b/examples/declarative/aspectratio/face_fit.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Here, we implement a hybrid of the "scale to fit" and "scale and crop" // behaviours which will crop up to 25% from *one* dimension if necessary // to fully scale the other. This is a realistic algorithm, for example diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml index 9036eeb..a1b9213 100644 --- a/examples/declarative/aspectratio/face_fit_animated.qml +++ b/examples/declarative/aspectratio/face_fit_animated.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Here, we extend the "face_fit" example with animation to show how truly // diverse and usage-specific behaviours are made possible by NOT putting a // hard-coded aspect ratio feature into the Image primitive. diff --git a/examples/declarative/aspectratio/scale_and_crop.qml b/examples/declarative/aspectratio/scale_and_crop.qml index 2f35fb5..20169f9 100644 --- a/examples/declarative/aspectratio/scale_and_crop.qml +++ b/examples/declarative/aspectratio/scale_and_crop.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Here, we implement "Scale and Crop" behaviour. // Rect { diff --git a/examples/declarative/aspectratio/scale_and_sidecrop.qml b/examples/declarative/aspectratio/scale_and_sidecrop.qml index 4b1eb63..c3aa742 100644 --- a/examples/declarative/aspectratio/scale_and_sidecrop.qml +++ b/examples/declarative/aspectratio/scale_and_sidecrop.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Here, we implement a variant of "Scale and Crop" behaviour, where we // crop the sides if necessary to fully fit vertically, but not the reverse. // diff --git a/examples/declarative/aspectratio/scale_to_fit.qml b/examples/declarative/aspectratio/scale_to_fit.qml index 867eb37..f6b14a4 100644 --- a/examples/declarative/aspectratio/scale_to_fit.qml +++ b/examples/declarative/aspectratio/scale_to_fit.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Here, we implement "Scale to Fit" behaviour "manually", rather // than using the preserveAspect property. // diff --git a/examples/declarative/aspectratio/scale_to_fit_simple.qml b/examples/declarative/aspectratio/scale_to_fit_simple.qml index 4f89586..f9c0e04 100644 --- a/examples/declarative/aspectratio/scale_to_fit_simple.qml +++ b/examples/declarative/aspectratio/scale_to_fit_simple.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Here, we implement "Scale to Fit" behaviour, using the // preserveAspect property. // diff --git a/examples/declarative/behaviours/MyRect.qml b/examples/declarative/behaviours/MyRect.qml index dc9a094..1ccf4db 100644 --- a/examples/declarative/behaviours/MyRect.qml +++ b/examples/declarative/behaviours/MyRect.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { radius: 15 pen.color: "black" diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml index 4c092bf..abf30c5 100644 --- a/examples/declarative/behaviours/test.qml +++ b/examples/declarative/behaviours/test.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "lightsteelblue" width: 800 diff --git a/examples/declarative/clock/Clock.qml b/examples/declarative/clock/Clock.qml index 4779bd5..9720d0b 100644 --- a/examples/declarative/clock/Clock.qml +++ b/examples/declarative/clock/Clock.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: Clock width: 200; height: 200 diff --git a/examples/declarative/clock/display.qml b/examples/declarative/clock/display.qml index 0187a7e..cd6dcf7 100644 --- a/examples/declarative/clock/display.qml +++ b/examples/declarative/clock/display.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: contents.width height: contents.height diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml index e66875a..1f3d187 100644 --- a/examples/declarative/connections/connections.qml +++ b/examples/declarative/connections/connections.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: rect color: "blue" diff --git a/examples/declarative/dial/DialLibrary/Dial.qml b/examples/declarative/dial/DialLibrary/Dial.qml index 6cd42df..e3ea530 100644 --- a/examples/declarative/dial/DialLibrary/Dial.qml +++ b/examples/declarative/dial/DialLibrary/Dial.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { property real value : 0 diff --git a/examples/declarative/dial/dial.qml b/examples/declarative/dial/dial.qml index b183798..ab31852 100644 --- a/examples/declarative/dial/dial.qml +++ b/examples/declarative/dial/dial.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "DialLibrary" Rect { color: "white" diff --git a/examples/declarative/dynamic/DynRect.qml b/examples/declarative/dynamic/DynRect.qml index d9a2ef3..3f83afb 100644 --- a/examples/declarative/dynamic/DynRect.qml +++ b/examples/declarative/dynamic/DynRect.qml @@ -1 +1,3 @@ +import Qt 4.6 + Rect { color: "steelblue"; width: 100; height: 100; id: newRect } diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml index b9f3b35..286e449 100644 --- a/examples/declarative/dynamic/dynamic.qml +++ b/examples/declarative/dynamic/dynamic.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: page; width: 800; height: 800; color:"black" Script { source: "dynamic.js" } property bool extendStars: false; diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml index 4fdf512..e3c22c9 100644 --- a/examples/declarative/easing/easing.qml +++ b/examples/declarative/easing/easing.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Window width: 640 diff --git a/examples/declarative/extending/adding/example.qml b/examples/declarative/extending/adding/example.qml index 5550cec..ba7af7a 100644 --- a/examples/declarative/extending/adding/example.qml +++ b/examples/declarative/extending/adding/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] Person { name: "Bob Jones" diff --git a/examples/declarative/extending/attached/example.qml b/examples/declarative/extending/attached/example.qml index 2645eac..20233f6 100644 --- a/examples/declarative/extending/attached/example.qml +++ b/examples/declarative/extending/attached/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + BirthdayParty { celebrant: Boy { name: "Bob Jones" diff --git a/examples/declarative/extending/binding/example.qml b/examples/declarative/extending/binding/example.qml index 02c0229..cedb8bd 100644 --- a/examples/declarative/extending/binding/example.qml +++ b/examples/declarative/extending/binding/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] BirthdayParty { id: TheParty diff --git a/examples/declarative/extending/coercion/example.qml b/examples/declarative/extending/coercion/example.qml index 8bcb45a..5090782 100644 --- a/examples/declarative/extending/coercion/example.qml +++ b/examples/declarative/extending/coercion/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] BirthdayParty { celebrant: Boy { diff --git a/examples/declarative/extending/default/example.qml b/examples/declarative/extending/default/example.qml index 4023abb..5fe693a 100644 --- a/examples/declarative/extending/default/example.qml +++ b/examples/declarative/extending/default/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] BirthdayParty { celebrant: Boy { diff --git a/examples/declarative/extending/extended/example.qml b/examples/declarative/extending/extended/example.qml index 040c324..a276211 100644 --- a/examples/declarative/extending/extended/example.qml +++ b/examples/declarative/extending/extended/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] QLineEdit { leftMargin: 20 diff --git a/examples/declarative/extending/grouped/example.qml b/examples/declarative/extending/grouped/example.qml index b9e5e6b..1be7abe 100644 --- a/examples/declarative/extending/grouped/example.qml +++ b/examples/declarative/extending/grouped/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] BirthdayParty { celebrant: Boy { diff --git a/examples/declarative/extending/properties/example.qml b/examples/declarative/extending/properties/example.qml index 63bb77b..326105a 100644 --- a/examples/declarative/extending/properties/example.qml +++ b/examples/declarative/extending/properties/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] BirthdayParty { celebrant: Person { diff --git a/examples/declarative/extending/signal/example.qml b/examples/declarative/extending/signal/example.qml index f3e4747..1cbaab4 100644 --- a/examples/declarative/extending/signal/example.qml +++ b/examples/declarative/extending/signal/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] BirthdayParty { onPartyStarted: print("This party started rockin' at " + time); diff --git a/examples/declarative/extending/valuesource/example.qml b/examples/declarative/extending/valuesource/example.qml index 033d9c4..aba2796 100644 --- a/examples/declarative/extending/valuesource/example.qml +++ b/examples/declarative/extending/valuesource/example.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ![0] BirthdayParty { speaker: HappyBirthday { name: "Bob Jones" } diff --git a/examples/declarative/flowview/flickr.qml b/examples/declarative/flowview/flickr.qml index 2742839..6c47b82 100644 --- a/examples/declarative/flowview/flickr.qml +++ b/examples/declarative/flowview/flickr.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { radius: 5; pen.width: 1; diff --git a/examples/declarative/flowview/flowview.qml b/examples/declarative/flowview/flowview.qml index 61b8794..77b3230 100644 --- a/examples/declarative/flowview/flowview.qml +++ b/examples/declarative/flowview/flowview.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 800 height: 800 diff --git a/examples/declarative/flowview/rect.qml b/examples/declarative/flowview/rect.qml index be2730f..9d81fa4 100644 --- a/examples/declarative/flowview/rect.qml +++ b/examples/declarative/flowview/rect.qml @@ -1,2 +1,4 @@ +import Qt 4.6 + Rect { radius: 5; pen.width: 1; width:400; height: 120; color: background; } diff --git a/examples/declarative/follow/follow.qml b/examples/declarative/follow/follow.qml index 37a953c..b906c12 100644 --- a/examples/declarative/follow/follow.qml +++ b/examples/declarative/follow/follow.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "#ffffff" width: 320; height: 240 diff --git a/examples/declarative/follow/pong.qml b/examples/declarative/follow/pong.qml index c101d8d..5a2d0ad 100644 --- a/examples/declarative/follow/pong.qml +++ b/examples/declarative/follow/pong.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Page width: 640; height: 480 diff --git a/examples/declarative/listview/content/MediaButton.qml b/examples/declarative/listview/content/MediaButton.qml index 6195daa..23ae466 100644 --- a/examples/declarative/listview/content/MediaButton.qml +++ b/examples/declarative/listview/content/MediaButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { property var text signal clicked diff --git a/examples/declarative/listview/dummydata/MyPetsModel.qml b/examples/declarative/listview/dummydata/MyPetsModel.qml index 4d76ff4..9a00dca 100644 --- a/examples/declarative/listview/dummydata/MyPetsModel.qml +++ b/examples/declarative/listview/dummydata/MyPetsModel.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // ListModel allows free form list models to be defined and populated. // Be sure to name the file the same as the id. ListModel { diff --git a/examples/declarative/listview/dummydata/Recipes.qml b/examples/declarative/listview/dummydata/Recipes.qml index 52225dd..533730f 100644 --- a/examples/declarative/listview/dummydata/Recipes.qml +++ b/examples/declarative/listview/dummydata/Recipes.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + ListModel { id: Recipes ListElement { diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml index 11230e1..092ce66 100644 --- a/examples/declarative/listview/highlight.qml +++ b/examples/declarative/listview/highlight.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 400; height: 300; color: "white" diff --git a/examples/declarative/listview/listview.qml b/examples/declarative/listview/listview.qml index a222378..82b04ed 100644 --- a/examples/declarative/listview/listview.qml +++ b/examples/declarative/listview/listview.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 600; height: 300; color: "white" diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml index 6536b06..788e067 100644 --- a/examples/declarative/listview/recipes.qml +++ b/examples/declarative/listview/recipes.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "content" // This example illustrates expanding a list item to show a more detailed view Rect { diff --git a/examples/declarative/listview/sections.qml b/examples/declarative/listview/sections.qml index 60acd62..415f524 100644 --- a/examples/declarative/listview/sections.qml +++ b/examples/declarative/listview/sections.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [0] Rect { width: 200 diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml index aec373b..5696f93 100644 --- a/examples/declarative/loader/Browser.qml +++ b/examples/declarative/loader/Browser.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Root width: parent.width diff --git a/examples/declarative/loader/Button.qml b/examples/declarative/loader/Button.qml index 3efedc4..7a17601 100644 --- a/examples/declarative/loader/Button.qml +++ b/examples/declarative/loader/Button.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Container diff --git a/examples/declarative/loader/loader.qml b/examples/declarative/loader/loader.qml index 6e4d6ec..447d73a 100644 --- a/examples/declarative/loader/loader.qml +++ b/examples/declarative/loader/loader.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Shell width: 300 diff --git a/examples/declarative/minehunt/Description.qml b/examples/declarative/minehunt/Description.qml index ea71d85..9ad6522 100644 --- a/examples/declarative/minehunt/Description.qml +++ b/examples/declarative/minehunt/Description.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: Page height: MyText.height + 20 diff --git a/examples/declarative/minehunt/Explosion.qml b/examples/declarative/minehunt/Explosion.qml index 84e93d4..b1fe848 100644 --- a/examples/declarative/minehunt/Explosion.qml +++ b/examples/declarative/minehunt/Explosion.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { property bool explode : false diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index 3dc1da4..6220d96 100644 --- a/examples/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: field width: 370 diff --git a/examples/declarative/modules/builtin-version.qml b/examples/declarative/modules/builtin-version.qml index 78eb860..82055b4 100644 --- a/examples/declarative/modules/builtin-version.qml +++ b/examples/declarative/modules/builtin-version.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import com.nokia.Qt 4.7 Rect {} // and later... SuperRect{} diff --git a/examples/declarative/modules/installed-qualified.qml b/examples/declarative/modules/installed-qualified.qml index c3217cf..3d40794 100644 --- a/examples/declarative/modules/installed-qualified.qml +++ b/examples/declarative/modules/installed-qualified.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import com.nokia.Foo as F Item { F.Bar { } diff --git a/examples/declarative/modules/installed-version.qml b/examples/declarative/modules/installed-version.qml index 4ba9a2b..8098b9b 100644 --- a/examples/declarative/modules/installed-version.qml +++ b/examples/declarative/modules/installed-version.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import com.nokia.Foo 1.6 import com.nokia.Foo 1.7 as NewFoo VerticalLayout { diff --git a/examples/declarative/modules/installed.qml b/examples/declarative/modules/installed.qml index 4ce5f76..a28fd10 100644 --- a/examples/declarative/modules/installed.qml +++ b/examples/declarative/modules/installed.qml @@ -1,2 +1,4 @@ +import Qt 4.6 + import com.nokia.Foo Foo.Bar { } diff --git a/examples/declarative/modules/local-qualified.qml b/examples/declarative/modules/local-qualified.qml index 36af092..8658031 100644 --- a/examples/declarative/modules/local-qualified.qml +++ b/examples/declarative/modules/local-qualified.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "local" as X import "local/SubLib" as Y diff --git a/examples/declarative/modules/local.qml b/examples/declarative/modules/local.qml index 70c90df..c90bde3 100644 --- a/examples/declarative/modules/local.qml +++ b/examples/declarative/modules/local.qml @@ -1,2 +1,4 @@ +import Qt 4.6 + import "local" Foo { } diff --git a/examples/declarative/modules/remote-qualified.qml b/examples/declarative/modules/remote-qualified.qml index d807af7..581c868 100644 --- a/examples/declarative/modules/remote-qualified.qml +++ b/examples/declarative/modules/remote-qualified.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "http://qml.nokia.com/Clock.zip" Item { Clock.Hand { ... } diff --git a/examples/declarative/modules/remote-zipped.qml b/examples/declarative/modules/remote-zipped.qml index aee838f..d325b65 100644 --- a/examples/declarative/modules/remote-zipped.qml +++ b/examples/declarative/modules/remote-zipped.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "http://qml.nokia.com/Clock.zip" Item { Clock { ... } diff --git a/examples/declarative/modules/wrong-installed-version.qml b/examples/declarative/modules/wrong-installed-version.qml index 3d2e3e5..4442b11 100644 --- a/examples/declarative/modules/wrong-installed-version.qml +++ b/examples/declarative/modules/wrong-installed-version.qml @@ -1,2 +1,4 @@ +import Qt 4.6 + import com.nokia.Foo 1.5 Baz { } // Not available in 1.5, only 1.6! diff --git a/examples/declarative/modules/wrong-installed.qml b/examples/declarative/modules/wrong-installed.qml index b0f2355..40cd9c5 100644 --- a/examples/declarative/modules/wrong-installed.qml +++ b/examples/declarative/modules/wrong-installed.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import com.nokia.NonExistent Rect {} diff --git a/examples/declarative/modules/wrong-local-qualified.qml b/examples/declarative/modules/wrong-local-qualified.qml index 92cbbf3..868bebf 100644 --- a/examples/declarative/modules/wrong-local-qualified.qml +++ b/examples/declarative/modules/wrong-local-qualified.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "local" as X // WRONG: if imported qualified, must qualify diff --git a/examples/declarative/modules/wrong-local.qml b/examples/declarative/modules/wrong-local.qml index 6cb00c4..1958659 100644 --- a/examples/declarative/modules/wrong-local.qml +++ b/examples/declarative/modules/wrong-local.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "local" // WRONG - cannot use qualification to access "local sublibraries". diff --git a/examples/declarative/modules/zipped-qualified.qml b/examples/declarative/modules/zipped-qualified.qml index 101df14..56e329f 100644 --- a/examples/declarative/modules/zipped-qualified.qml +++ b/examples/declarative/modules/zipped-qualified.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Not currently supported import "zips/ClockPack.zip" as CP Item { diff --git a/examples/declarative/modules/zipped.qml b/examples/declarative/modules/zipped.qml index 9a0775c..4464616 100644 --- a/examples/declarative/modules/zipped.qml +++ b/examples/declarative/modules/zipped.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Not currently supported import "zips/ClockPack.zip" Item { diff --git a/examples/declarative/mouseregion/mouse.qml b/examples/declarative/mouseregion/mouse.qml index 5ef484c..0948a32 100644 --- a/examples/declarative/mouseregion/mouse.qml +++ b/examples/declarative/mouseregion/mouse.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "white" width: 200; height: 200 diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml index 8020d62..93e4de6 100644 --- a/examples/declarative/scrollbar/ScrollBar.qml +++ b/examples/declarative/scrollbar/ScrollBar.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: ScrollBar // The properties that define the scrollbar's state. diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml index ae28ef1..03a40d3 100644 --- a/examples/declarative/scrollbar/display.qml +++ b/examples/declarative/scrollbar/display.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 640 height: 480 diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml index e0c2dd9..91627c7 100644 --- a/examples/declarative/slideswitch/Switch.qml +++ b/examples/declarative/slideswitch/Switch.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: Switch width: Groove.width; height: Groove.height diff --git a/examples/declarative/slideswitch/display.qml b/examples/declarative/slideswitch/display.qml index cea89b6..db67dab 100644 --- a/examples/declarative/slideswitch/display.qml +++ b/examples/declarative/slideswitch/display.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "white" width: 150 diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml index 4c65605..77bacab 100644 --- a/examples/declarative/snow/ImageBatch.qml +++ b/examples/declarative/snow/ImageBatch.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + GridView { id: MyGrid property int offset: 0 diff --git a/examples/declarative/snow/Loading.qml b/examples/declarative/snow/Loading.qml index 0a8a51a..ff2c829 100644 --- a/examples/declarative/snow/Loading.qml +++ b/examples/declarative/snow/Loading.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Image { id: Loading; source: "pics/loading.png"; transformOrigin: "Center" rotation: NumberAnimation { diff --git a/examples/declarative/snow/snow.qml b/examples/declarative/snow/snow.qml index f65e0ac..aaed619 100644 --- a/examples/declarative/snow/snow.qml +++ b/examples/declarative/snow/snow.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: ImagePanel width: 1024 diff --git a/examples/declarative/states/states.qml b/examples/declarative/states/states.qml index c7ee172..431f0bc 100644 --- a/examples/declarative/states/states.qml +++ b/examples/declarative/states/states.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Page width: 300; height: 300; color: "white" diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml index 1a719ed..7bc7f6c 100644 --- a/examples/declarative/states/transitions.qml +++ b/examples/declarative/states/transitions.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Page width: 300; height: 300; color: "white" diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml index bbe9f55..fcfb082 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [0] Rect { id: removeButton diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml index cc5ebae..92ca377 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: page width: layout.width diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml index 247e38b..dc5a486 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [0] Rect { id: removeButton diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml index 6c6a949..f60bc9b 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [0] Rect { id: removeButton diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml index 3c20462..6426457 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [0] Rect { id: removeButton diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml index 135a519..c97426c 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml index 5ee56ce..712471f 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml index 58662d1..acc9896 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml index 064aaa2..42feeb1 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + FocusRealm { id: groupBox width: Math.max(270, subItem.width+40) diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml index 0218c3d..162452f 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [load] Item { id: contactField diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml index a0f3880..5392154 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml index 62089b8..e3081b9 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [load] Item { id: contactField diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml index a0f3880..5392154 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml index 92893f6..a68adc1 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [all] Rect { width: 100 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml index 7baa8af..e47aff2 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml index 2542c1c..2e1a488 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: contactField clip: true diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml index 472fe60..32e8ce0 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [define properties and signals] Rect { id: removeButton diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml index 6ad2eb5..3b0ef67 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: page width: layout.width diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml index 763a771..4c458c8 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: contactDetails width: 230 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml index cdbcd13..7957ed1 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [all] Item { id: contactField diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml index 084d8fd..e0651c8 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [value change] Rect { id: fieldText diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml index dc9c9b3..6280877 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [all] Rect { id: removeButton diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml index bcb242f..f70153b 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + //! [grab property] Item { id: contactDetails diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml index 4cd74a7..d637fa6 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: contactField clip: true diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml index cbb2a1f..21e3bf2 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: fieldText height: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml index 57750a0..03b50eec 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml index 064aaa2..42feeb1 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + FocusRealm { id: groupBox width: Math.max(270, subItem.width+40) diff --git a/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml index 5400544..25cb539 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/1/ContactView.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "../lib" Item { id: contacts diff --git a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml index 120c7ba..13e2ab1 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "../lib" Item { id: contacts diff --git a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml index 82b55af..46e09a0 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + import "../lib" Item { id: contacts diff --git a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml index 7d9937c..21615cb 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: page width: layout.width diff --git a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml index 064aaa2..42feeb1 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + FocusRealm { id: groupBox width: Math.max(270, subItem.width+40) diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml index 629dce8..f5024e5 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: button width: 30 diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml index 6832076..129ea85 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: contactDetails anchors.fill: parent diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml index 4cd74a7..d637fa6 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { id: contactField clip: true diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml index 133262a..4506ec9 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: fieldText height: 30 diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml index 005daaa..866a23f 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: removeButton width: 30 diff --git a/examples/declarative/tutorials/helloworld/t1/tutorial1.qml b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml index 4e53b8e..f067695 100644 --- a/examples/declarative/tutorials/helloworld/t1/tutorial1.qml +++ b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Page width: 480 diff --git a/examples/declarative/tutorials/helloworld/t2/Cell.qml b/examples/declarative/tutorials/helloworld/t2/Cell.qml index 0109251..0b8ae3f 100644 --- a/examples/declarative/tutorials/helloworld/t2/Cell.qml +++ b/examples/declarative/tutorials/helloworld/t2/Cell.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { property var color diff --git a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml index 6c7e68e..fdb8f3c 100644 --- a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml +++ b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Page width: 480 diff --git a/examples/declarative/tutorials/helloworld/t3/Cell.qml b/examples/declarative/tutorials/helloworld/t3/Cell.qml index e779406..460d569 100644 --- a/examples/declarative/tutorials/helloworld/t3/Cell.qml +++ b/examples/declarative/tutorials/helloworld/t3/Cell.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { property var color diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml index 664bf45..557f2ca 100644 --- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml +++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Page width: 480 diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml index 5154c91..05e1f07 100644 --- a/examples/declarative/velocity/Day.qml +++ b/examples/declarative/velocity/Day.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { property string day property var stickies diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml index 786f364..a1fbcc1 100644 --- a/examples/declarative/velocity/velocity.qml +++ b/examples/declarative/velocity/velocity.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "lightSteelBlue" width: 800 diff --git a/examples/declarative/webview/autosize.qml b/examples/declarative/webview/autosize.qml index c32b752..2930657 100644 --- a/examples/declarative/webview/autosize.qml +++ b/examples/declarative/webview/autosize.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // The WebView size is determined by the width, height, // idealWidth, and idealHeight properties. Rect { diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml index 640416f..63336ef 100644 --- a/examples/declarative/webview/content/SpinSquare.qml +++ b/examples/declarative/webview/content/SpinSquare.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { properties var period : 250 properties var color : "black" diff --git a/examples/declarative/webview/inline-html.qml b/examples/declarative/webview/inline-html.qml index 5f6d410..23b4555 100644 --- a/examples/declarative/webview/inline-html.qml +++ b/examples/declarative/webview/inline-html.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // Inline HTML with loose formatting can be // set on the html property. WebView { diff --git a/examples/declarative/webview/qml-in-html.qml b/examples/declarative/webview/qml-in-html.qml index 29dded5..2ae3476 100644 --- a/examples/declarative/webview/qml-in-html.qml +++ b/examples/declarative/webview/qml-in-html.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // The WebView supports QML data through the HTML OBJECT tag Rect { color:"blue" diff --git a/examples/declarative/webview/transparent.qml b/examples/declarative/webview/transparent.qml index 8614822..c23b5f5 100644 --- a/examples/declarative/webview/transparent.qml +++ b/examples/declarative/webview/transparent.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + // The WebView background is transparent // if the HTML does not specify a background Rect { diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index 6f3461e..4fb12af 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "white" width: 600 diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index 9d0c956..c7f0b08 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { gradient: Gradient { GradientStop { position: 0; color: "black" } diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp index 4c74f6f..c4b949a 100644 --- a/src/declarative/extra/qfxanimatedimageitem.cpp +++ b/src/declarative/extra/qfxanimatedimageitem.cpp @@ -77,7 +77,7 @@ Item { \endqml \endtable */ -QML_DEFINE_TYPE(QFxAnimatedImageItem, AnimatedImage) +QML_DEFINE_TYPE(Qt,4.6,AnimatedImage,QFxAnimatedImageItem) QFxAnimatedImageItem::QFxAnimatedImageItem(QFxItem *parent) : QFxImage(*(new QFxAnimatedImageItemPrivate), parent) diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp index 1676512..0cfb7a9 100644 --- a/src/declarative/extra/qfxflowview.cpp +++ b/src/declarative/extra/qfxflowview.cpp @@ -1,3 +1,5 @@ +import Qt 4.6 + /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qfxintegermodel.cpp index 437073e..f536fee 100644 --- a/src/declarative/extra/qfxintegermodel.cpp +++ b/src/declarative/extra/qfxintegermodel.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxIntegerModel, IntegerModel) +QML_DEFINE_TYPE(Qt,4.6,IntegerModel,QFxIntegerModel) class QFxIntegerModelPrivate { diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qfxparticles.cpp index a7b01dd..9f7319f 100644 --- a/src/declarative/extra/qfxparticles.cpp +++ b/src/declarative/extra/qfxparticles.cpp @@ -102,7 +102,7 @@ public: //--------------------------------------------------------------------------- -QML_DEFINE_TYPE(QFxParticleMotion,ParticleMotion) +QML_DEFINE_TYPE(Qt,4.6,ParticleMotion,QFxParticleMotion) /*! \class QFxParticleMotion @@ -162,7 +162,7 @@ void QFxParticleMotion::destroy(QFxParticle &particle) \brief The QFxParticleMotionLinear class moves the particles linearly. */ -QML_DEFINE_TYPE(QFxParticleMotionLinear,ParticleMotionLinear) +QML_DEFINE_TYPE(Qt,4.6,ParticleMotionLinear,QFxParticleMotionLinear) void QFxParticleMotionLinear::advance(QFxParticle &p, int interval) { @@ -184,7 +184,7 @@ void QFxParticleMotionLinear::advance(QFxParticle &p, int interval) \brief The QFxParticleMotionGravity class moves the particles towards a point. */ -QML_DEFINE_TYPE(QFxParticleMotionGravity,ParticleMotionGravity) +QML_DEFINE_TYPE(Qt,4.6,ParticleMotionGravity,QFxParticleMotionGravity) /*! \qmlproperty int ParticleMotionGravity::xattractor @@ -286,7 +286,7 @@ Rect { This property holds how quickly the paricles will move from side to side. */ -QML_DEFINE_TYPE(QFxParticleMotionWander,ParticleMotionWander) +QML_DEFINE_TYPE(Qt,4.6,ParticleMotionWander,QFxParticleMotionWander) void QFxParticleMotionWander::advance(QFxParticle &p, int interval) { @@ -528,7 +528,7 @@ void QFxParticlesPrivate::updateOpacity(QFxParticle &p, int age) } } -QML_DEFINE_TYPE(QFxParticles,Particles) +QML_DEFINE_TYPE(Qt,4.6,Particles,QFxParticles) /*! \qmlclass Particles diff --git a/src/declarative/extra/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp index 92a85b0..7f82b1a 100644 --- a/src/declarative/extra/qmlbehaviour.cpp +++ b/src/declarative/extra/qmlbehaviour.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlBehaviour,Behavior) +QML_DEFINE_TYPE(Qt,4.6,Behavior,QmlBehaviour) class QmlBehaviourData : public QObject { diff --git a/src/declarative/extra/qmldatetimeformatter.cpp b/src/declarative/extra/qmldatetimeformatter.cpp index 158431a..08f73cf 100644 --- a/src/declarative/extra/qmldatetimeformatter.cpp +++ b/src/declarative/extra/qmldatetimeformatter.cpp @@ -365,6 +365,6 @@ void QmlDateTimeFormatter::classComplete() d->updateText(); } -QML_DEFINE_TYPE(QmlDateTimeFormatter, DateTimeFormatter) +QML_DEFINE_TYPE(Qt,4.6,DateTimeFormatter,QmlDateTimeFormatter) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlfolderlistmodel.cpp b/src/declarative/extra/qmlfolderlistmodel.cpp index 4a71109..4f36bbf 100644 --- a/src/declarative/extra/qmlfolderlistmodel.cpp +++ b/src/declarative/extra/qmlfolderlistmodel.cpp @@ -207,7 +207,7 @@ void QmlFolderListModel::dataChanged(const QModelIndex &start, const QModelIndex emit itemsChanged(start.row(), end.row() - start.row() + 1, roles()); } -QML_DEFINE_TYPE(QmlFolderListModel,FolderListModel) +QML_DEFINE_TYPE(Qt,4.6,FolderListModel,QmlFolderListModel) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/extra/qmlnumberformatter.cpp index b24f2d8..bcb9eed 100644 --- a/src/declarative/extra/qmlnumberformatter.cpp +++ b/src/declarative/extra/qmlnumberformatter.cpp @@ -210,6 +210,6 @@ void QmlNumberFormatter::classComplete() d->classComplete = true; d->updateText(); } -QML_DEFINE_TYPE(QmlNumberFormatter, NumberFormatter); +QML_DEFINE_TYPE(Qt,4.6,NumberFormatter,QmlNumberFormatter); QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlsqlconnection.cpp b/src/declarative/extra/qmlsqlconnection.cpp index 5cf572b..55af930 100644 --- a/src/declarative/extra/qmlsqlconnection.cpp +++ b/src/declarative/extra/qmlsqlconnection.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlSqlConnection, SqlConnection) +QML_DEFINE_TYPE(Qt,4.6,SqlConnection,QmlSqlConnection) class QmlSqlConnectionPrivate: public QObjectPrivate { diff --git a/src/declarative/extra/qmlsqlquery.cpp b/src/declarative/extra/qmlsqlquery.cpp index d9d9760..fb49bd5 100644 --- a/src/declarative/extra/qmlsqlquery.cpp +++ b/src/declarative/extra/qmlsqlquery.cpp @@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlSqlBind, SqlBind) -QML_DEFINE_TYPE(QmlSqlQuery, SqlQuery) +QML_DEFINE_TYPE(Qt,4.6,SqlBind,QmlSqlBind) +QML_DEFINE_TYPE(Qt,4.6,SqlQuery,QmlSqlQuery) class QmlSqlBindPrivate : public QObjectPrivate { diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index 91ad538..f142b7c 100644 --- a/src/declarative/extra/qmlxmllistmodel.cpp +++ b/src/declarative/extra/qmlxmllistmodel.cpp @@ -58,8 +58,8 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(XmlListModelRole, XmlRole) -QML_DEFINE_TYPE(QmlXmlListModel, XmlListModel) +QML_DEFINE_TYPE(Qt,4.6,XmlRole,XmlListModelRole) +QML_DEFINE_TYPE(Qt,4.6,XmlListModel,QmlXmlListModel) class QmlXmlListModelPrivate; struct QmlXmlRoleList : public QmlConcreteList<XmlListModelRole *> diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 350cbc0..700bc01 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxAnchors,Anchors) +QML_DEFINE_TYPE(Qt,4.6,Anchors,QFxAnchors) //TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)? //TODO: support non-parent, non-sibling (need to find lowest common ancestor) diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp index 6cf8e74..2876459 100644 --- a/src/declarative/fx/qfxcomponentinstance.cpp +++ b/src/declarative/fx/qfxcomponentinstance.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxComponentInstance,ComponentInstance) +QML_DEFINE_TYPE(Qt,4.6,ComponentInstance,QFxComponentInstance) /*! \internal diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 1db6e8b..3329ea6 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -228,7 +228,7 @@ void QFxFlickablePrivate::updateBeginningEnd() static const int FlickThreshold = 5; -QML_DEFINE_TYPE(QFxFlickable,Flickable) +QML_DEFINE_TYPE(Qt,4.6,Flickable,QFxFlickable) /*! \qmlclass Flickable diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index 6089d0a..0383051 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxFlipable,Flipable) +QML_DEFINE_TYPE(Qt,4.6,Flipable,QFxFlipable) class QFxFlipablePrivate : public QFxItemPrivate { diff --git a/src/declarative/fx/qfxfocusrealm.cpp b/src/declarative/fx/qfxfocusrealm.cpp index 9270bb2..04beaad 100644 --- a/src/declarative/fx/qfxfocusrealm.cpp +++ b/src/declarative/fx/qfxfocusrealm.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxFocusRealm,FocusRealm) +QML_DEFINE_TYPE(Qt,4.6,FocusRealm,QFxFocusRealm) /*! \qmlclass FocusRealm diff --git a/src/declarative/fx/qfxgraphicsobjectcontainer.cpp b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp index a82ea3d..f3f2e0d 100644 --- a/src/declarative/fx/qfxgraphicsobjectcontainer.cpp +++ b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE */ QML_DEFINE_NOCREATE_TYPE(QGraphicsObject) -QML_DEFINE_TYPE(QFxGraphicsObjectContainer, GraphicsObjectContainer) +QML_DEFINE_TYPE(Qt,4.6,GraphicsObjectContainer,QFxGraphicsObjectContainer) QFxGraphicsObjectContainer::QFxGraphicsObjectContainer(QFxItem *parent) : QFxItem(parent), _graphicsObject(0) diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index 3c80e98..4512b46 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -1,3 +1,5 @@ +import Qt 4.6 + /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index 7445606..738809c 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxImage,Image) +QML_DEFINE_TYPE(Qt,4.6,Image,QFxImage) /*! \qmlclass Image QFxImage diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 354e4cc..d229eab 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE #endif QML_DEFINE_NOCREATE_TYPE(QFxContents) -QML_DEFINE_TYPE(QFxItem,Item) +QML_DEFINE_TYPE(Qt,4.6,Item,QFxItem) /*! \group group_animation diff --git a/src/declarative/fx/qfxkeyactions.cpp b/src/declarative/fx/qfxkeyactions.cpp index 5de1f0b..892b3ca 100644 --- a/src/declarative/fx/qfxkeyactions.cpp +++ b/src/declarative/fx/qfxkeyactions.cpp @@ -44,7 +44,7 @@ #include <QKeyEvent> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxKeyActions,KeyActions) +QML_DEFINE_TYPE(Qt,4.6,KeyActions,QFxKeyActions) class QFxKeyActionsPrivate { diff --git a/src/declarative/fx/qfxkeyproxy.cpp b/src/declarative/fx/qfxkeyproxy.cpp index e4b4269..714e979 100644 --- a/src/declarative/fx/qfxkeyproxy.cpp +++ b/src/declarative/fx/qfxkeyproxy.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxKeyProxy,KeyProxy) +QML_DEFINE_TYPE(Qt,4.6,KeyProxy,QFxKeyProxy) /*! \qmlclass KeyProxy diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index f71b35a..c098dfc 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -445,7 +445,7 @@ void QFxBaseLayout::applyRemove(const QList<QPair<QString, QVariant> >& changes, applyTransition(changes,target, remove()); } -QML_DEFINE_TYPE(QFxVerticalLayout, VerticalLayout) +QML_DEFINE_TYPE(Qt,4.6,VerticalLayout,QFxVerticalLayout) /*! \qmlclass VerticalLayout \brief The VerticalLayout item arranges its children in a vertical layout. @@ -648,7 +648,7 @@ void QFxVerticalLayout::doLayout() setMovingItem(0); } -QML_DEFINE_TYPE(QFxHorizontalLayout,HorizontalLayout) +QML_DEFINE_TYPE(Qt,4.6,HorizontalLayout,QFxHorizontalLayout) /*! \qmlclass HorizontalLayout \brief The HorizontalLayout item arranges its children in a horizontal layout. @@ -813,7 +813,7 @@ void QFxHorizontalLayout::doLayout() setWidth(hoffset); } -QML_DEFINE_TYPE(QFxGridLayout,GridLayout) +QML_DEFINE_TYPE(Qt,4.6,GridLayout,QFxGridLayout) /*! \qmlclass GridLayout QFxGridLayout diff --git a/src/declarative/fx/qfxlineedit.cpp b/src/declarative/fx/qfxlineedit.cpp index bafd782..4e2a56e 100644 --- a/src/declarative/fx/qfxlineedit.cpp +++ b/src/declarative/fx/qfxlineedit.cpp @@ -47,8 +47,8 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxLineEdit,LineEdit); -QML_DEFINE_TYPE(QIntValidator,QIntValidator); +QML_DEFINE_TYPE(Qt,4.6,LineEdit,QFxLineEdit); +QML_DEFINE_TYPE(Qt,4.6,QIntValidator,QIntValidator); QFxLineEdit::QFxLineEdit(QFxItem* parent) : QFxPaintedItem(*(new QFxLineEditPrivate), parent) diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 50564fb..9c07d6f 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -1643,7 +1643,7 @@ QObject *QFxListView::qmlAttachedProperties(QObject *obj) return QFxListViewAttached::properties(obj); } -QML_DEFINE_TYPE(QFxListView,ListView) +QML_DEFINE_TYPE(Qt,4.6,ListView,QFxListView) QT_END_NAMESPACE #include "qfxlistview.moc" diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index af16d4d..c476994a 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE static const int DragThreshold = 5; static const int PressAndHoldDelay = 800; -QML_DEFINE_TYPE(QFxDrag,Drag) +QML_DEFINE_TYPE(Qt,4.6,Drag,QFxDrag) QFxDrag::QFxDrag(QObject *parent) : QObject(parent), _target(0), _xmin(0), _xmax(0), _ymin(0), _ymax(0) { @@ -233,7 +233,7 @@ void QFxDrag::setYmax(int m) position of the release of the click, and whether the click wasHeld. */ -QML_DEFINE_TYPE(QFxMouseRegion,MouseRegion) +QML_DEFINE_TYPE(Qt,4.6,MouseRegion,QFxMouseRegion) /*! \internal diff --git a/src/declarative/fx/qfxpath.cpp b/src/declarative/fx/qfxpath.cpp index a1b6032..b4376a1 100644 --- a/src/declarative/fx/qfxpath.cpp +++ b/src/declarative/fx/qfxpath.cpp @@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPath,Path) +QML_DEFINE_TYPE(Qt,4.6,Path,QFxPath) QML_DEFINE_NOCREATE_TYPE(QFxPathElement) QML_DEFINE_NOCREATE_TYPE(QFxCurve) -QML_DEFINE_TYPE(QFxPathAttribute,PathAttribute) -QML_DEFINE_TYPE(QFxPathPercent,PathPercent) -QML_DEFINE_TYPE(QFxPathLine,PathLine) -QML_DEFINE_TYPE(QFxPathQuad,PathQuad) -QML_DEFINE_TYPE(QFxPathCubic,PathCubic) +QML_DEFINE_TYPE(Qt,4.6,PathAttribute,QFxPathAttribute) +QML_DEFINE_TYPE(Qt,4.6,PathPercent,QFxPathPercent) +QML_DEFINE_TYPE(Qt,4.6,PathLine,QFxPathLine) +QML_DEFINE_TYPE(Qt,4.6,PathQuad,QFxPathQuad) +QML_DEFINE_TYPE(Qt,4.6,PathCubic,QFxPathCubic) /*! \qmlclass PathElement diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp index 47364d0..396aed3 100644 --- a/src/declarative/fx/qfxpathview.cpp +++ b/src/declarative/fx/qfxpathview.cpp @@ -54,7 +54,7 @@ static const int FlickThreshold = 5; QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPathView,PathView) +QML_DEFINE_TYPE(Qt,4.6,PathView,QFxPathView) class QFxPathViewAttached : public QObject { diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index 32d3eb4..fb22c98 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -45,9 +45,9 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPen,Pen) -QML_DEFINE_TYPE(QFxGradientStop,GradientStop) -QML_DEFINE_TYPE(QFxGradient,Gradient) +QML_DEFINE_TYPE(Qt,4.6,Pen,QFxPen) +QML_DEFINE_TYPE(Qt,4.6,GradientStop,QFxGradientStop) +QML_DEFINE_TYPE(Qt,4.6,Gradient,QFxGradient) /*! \internal @@ -185,7 +185,7 @@ void QFxGradient::doUpdate() emit updated(); } -QML_DEFINE_TYPE(QFxRect,Rect) +QML_DEFINE_TYPE(Qt,4.6,Rect,QFxRect) /*! \qmlclass Rect QFxRect diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index a4dc809..97683eb 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -72,7 +72,7 @@ QFxItem *QFxRepeaterPrivate::addItem(QmlContext *ctxt, QFxItem *lastItem) return item; } -QML_DEFINE_TYPE(QFxRepeater,Repeater) +QML_DEFINE_TYPE(Qt,4.6,Repeater,QFxRepeater) /*! \qmlclass Repeater diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index 3d36bf3..4215e27 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -52,7 +52,7 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxText,Text) +QML_DEFINE_TYPE(Qt,4.6,Text,QFxText) /*! \qmlclass Text QFxText diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index 4a8085b..8ff753e 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -53,7 +53,7 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxTextEdit, TextEdit) +QML_DEFINE_TYPE(Qt,4.6,TextEdit,QFxTextEdit) /*! \qmlclass TextEdit diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp index f08d830..7bdd5c1 100644 --- a/src/declarative/fx/qfxtransform.cpp +++ b/src/declarative/fx/qfxtransform.cpp @@ -199,7 +199,7 @@ void QFxScale::update() QFxTransform::update(); } -QML_DEFINE_TYPE(QFxScale, Scale) +QML_DEFINE_TYPE(Qt,4.6,Scale,QFxScale) /*! @@ -218,7 +218,7 @@ QML_DEFINE_TYPE(QFxScale, Scale) \endqml */ -QML_DEFINE_TYPE(QFxAxis, Axis) +QML_DEFINE_TYPE(Qt,4.6,Axis,QFxAxis) QFxAxis::QFxAxis(QObject *parent) : QObject(parent), _startX(0), _startY(0), _endX(0), _endY(0), _endZ(0) @@ -391,7 +391,7 @@ void QFxRotation::update() QFxTransform::update(); } -QML_DEFINE_TYPE(QFxRotation, Rotation) +QML_DEFINE_TYPE(Qt,4.6,Rotation,QFxRotation) /*! \qmlclass Rotation3D @@ -403,7 +403,7 @@ QML_DEFINE_TYPE(QFxRotation, Rotation) \image axisrotation.png */ -QML_DEFINE_TYPE(QFxRotation3D,Rotation3D) +QML_DEFINE_TYPE(Qt,4.6,Rotation3D,QFxRotation3D) QFxRotation3D::QFxRotation3D(QObject *parent) : QFxTransform(parent), _angle(0), _dirty(true) @@ -529,7 +529,7 @@ Image { \endqml */ -QML_DEFINE_TYPE(QFxTranslation3D,Translation3D) +QML_DEFINE_TYPE(Qt,4.6,Translation3D,QFxTranslation3D) QFxTranslation3D::QFxTranslation3D(QObject *parent) : QFxTransform(parent), _distance(0), _dirty(true) @@ -627,7 +627,7 @@ void QFxTranslation3D::update() OpenGL. When running under software rasterization it has no effect. */ -QML_DEFINE_TYPE(QFxPerspective,Perspective) +QML_DEFINE_TYPE(Qt,4.6,Perspective,QFxPerspective) QFxPerspective::QFxPerspective(QObject *parent) : QFxTransform(parent) @@ -724,7 +724,7 @@ QFxPerspective::~QFxPerspective() \image squish.png */ -QML_DEFINE_TYPE(QFxSquish,Squish) +QML_DEFINE_TYPE(Qt,4.6,Squish,QFxSquish) QFxSquish::QFxSquish(QObject *parent) : QFxTransform(parent) diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp index 3d336c5..ee94831 100644 --- a/src/declarative/fx/qfxvisualitemmodel.cpp +++ b/src/declarative/fx/qfxvisualitemmodel.cpp @@ -767,7 +767,7 @@ void QFxVisualItemModel::_q_destroyingPackage(QmlPackage *package) emit destroyingItem(qobject_cast<QFxItem*>(package->part(d->m_part))); } -QML_DEFINE_TYPE(QFxVisualItemModel,VisualModel) +QML_DEFINE_TYPE(Qt,4.6,VisualModel,QFxVisualItemModel) QT_END_NAMESPACE #include "qfxvisualitemmodel.moc" diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 6c23198..667dc7b 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -63,7 +63,7 @@ #include <private/qfxpainteditem_p.h> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxWebView,WebView) +QML_DEFINE_TYPE(Qt,4.6,WebView,QFxWebView) static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index d43e693..5dd57bc 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -73,17 +73,14 @@ QT_MODULE(Declarative) QT_BEGIN_NAMESPACE -//#define QML_FORCE_NAMESPACE "Qt/4.6/" -#define QML_FORCE_NAMESPACE - #define QML_DEFINE_INTERFACE(INTERFACE) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<INTERFACE *>::instance(qmlRegisterInterface<INTERFACE>(#INTERFACE)); -#define QML_DEFINE_EXTENDED_TYPE(TYPE, NAME, EXTENSION) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(QML_FORCE_NAMESPACE #NAME, #TYPE)); +#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION, NAME, TYPE, EXTENSION) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, #VERSION, #NAME, #TYPE)); -#define QML_DEFINE_TYPE(TYPE, NAME) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(QML_FORCE_NAMESPACE #NAME, #TYPE)); +#define QML_DEFINE_TYPE(URI, VERSION, NAME, TYPE) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(#URI, #VERSION, #NAME, #TYPE)); #define QML_DEFINE_EXTENDED_NOCREATE_TYPE(TYPE, EXTENSION) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#TYPE)); diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 0fdba64..4de114d 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -95,7 +95,7 @@ Item { } \endqml */ -QML_DEFINE_TYPE(QmlComponent,Component); +QML_DEFINE_TYPE(Qt,4.6,Component,QmlComponent); /*! \enum QmlComponent::Status diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 914ddbd..63144d6 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -112,8 +112,8 @@ public: virtual QByteArray compile(const QList<QmlCustomParserProperty> &, bool *ok); virtual void setCustomData(QObject *, const QByteArray &); }; -#define QML_DEFINE_CUSTOM_TYPE(TYPE, NAME, CUSTOMTYPE) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterCustomType<TYPE>(#NAME, #TYPE, new CUSTOMTYPE)); +#define QML_DEFINE_CUSTOM_TYPE(URI, VERSION, NAME, TYPE, CUSTOMTYPE) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterCustomType<TYPE>(#URI, #VERSION, #NAME, #TYPE, new CUSTOMTYPE)); QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index c4b3c0d..492be3b 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER) DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) -QML_DEFINE_TYPE(QObject,Object) +QML_DEFINE_TYPE(Qt,4.6,Object,QObject) struct StaticQtMetaObject : public QObject { diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index 16baf08..bb05ebd 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -56,6 +56,7 @@ #include <qstringlist.h> #include <qvector.h> #include <qlocale.h> +//#include <ctypes.h> #include <QtCore/qcryptographichash.h> #include <private/qmlcustomparser_p.h> @@ -416,26 +417,35 @@ int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id, return index; } -int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QmlPrivate::Func func, const char *cname, const QMetaObject *mo, QmlAttachedPropertiesFunc attach, const QMetaObject *attachMo, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *parser) +int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QmlPrivate::Func func, const char *uri, const char *version, const char *cname, const QMetaObject *mo, QmlAttachedPropertiesFunc attach, const QMetaObject *attachMo, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *parser) { Q_UNUSED(object); QWriteLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); - QString name = QLatin1String(cname); + QByteArray name = cname; for (int ii = 0; ii < name.count(); ++ii) { - QChar ch = name.at(ii); - if (!ch.isLetterOrNumber() && ch != QChar::fromLatin1('/') && ch != QChar::fromLatin1('.')) { + if (!isalnum(name.at(ii))) { qWarning("QmlMetaType: Invalid QML name %s", cname); return -1; } } + // XXX Only adding specified version. Need all relevant versions! + if (uri) { + if (version) + name = QByteArray(uri) + '/' + version + '/' + name; + else + name = QByteArray(uri) + '/' + name; + } else { + Q_ASSERT(!version); + } + int index = data->types.count(); QmlType *type = new QmlType(id.typeId, id.listId, id.qmlListId, - func, cname, mo, attach, attachMo, pStatus, extFunc, + func, name, mo, attach, attachMo, pStatus, extFunc, extmo, index, parser); data->types.append(type); diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h index d10a0f0..d83b83e 100644 --- a/src/declarative/qml/qmlmetatype.h +++ b/src/declarative/qml/qmlmetatype.h @@ -59,7 +59,7 @@ class QmlCustomParser; class Q_DECLARATIVE_EXPORT QmlMetaType { public: - static int registerType(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *); + static int registerType(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *, const char *, const char *, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *); static int registerInterface(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *); static bool copy(int type, void *data, const void *copy = 0); @@ -163,7 +163,7 @@ int qmlRegisterType(const char *typeName) qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData()) }; - return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, + return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, &T::staticMetaObject, QmlPrivate::attachedPropertiesFunc<T>(), QmlPrivate::attachedPropertiesMetaObject<T>(), @@ -173,7 +173,7 @@ int qmlRegisterType(const char *typeName) } template<typename T> -int qmlRegisterType(const char *qmlName, const char *typeName) +int qmlRegisterType(const char *uri, const char *version, const char *qmlName, const char *typeName) { QByteArray name(typeName); QmlPrivate::MetaTypeIds ids = { @@ -182,7 +182,7 @@ int qmlRegisterType(const char *qmlName, const char *typeName) qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData()) }; - return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, qmlName, + return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, uri, version, qmlName, &T::staticMetaObject, QmlPrivate::attachedPropertiesFunc<T>(), QmlPrivate::attachedPropertiesMetaObject<T>(), @@ -210,7 +210,7 @@ int qmlRegisterExtendedType(const char *typeName) attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>(); } - return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, + return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, &T::staticMetaObject, attached, attachedMo, QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), QmlPrivate::StaticCastSelector<T,QObject>::cast(), @@ -218,7 +218,7 @@ int qmlRegisterExtendedType(const char *typeName) } template<typename T, typename E> -int qmlRegisterExtendedType(const char *qmlName, const char *typeName) +int qmlRegisterExtendedType(const char *uri, const char *version, const char *qmlName, const char *typeName) { QByteArray name(typeName); QmlPrivate::MetaTypeIds ids = { @@ -237,7 +237,7 @@ int qmlRegisterExtendedType(const char *qmlName, const char *typeName) } return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, - qmlName, + uri, version, qmlName, &T::staticMetaObject, attached, attachedMo, QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), @@ -262,7 +262,7 @@ int qmlRegisterInterface(const char *typeName) } template<typename T> -int qmlRegisterCustomType(const char *qmlName, const char *typeName, QmlCustomParser *parser) +int qmlRegisterCustomType(const char *uri, const char *version, const char *qmlName, const char *typeName, QmlCustomParser *parser) { QByteArray name(typeName); QmlPrivate::MetaTypeIds ids = { @@ -271,7 +271,7 @@ int qmlRegisterCustomType(const char *qmlName, const char *typeName, QmlCustomPa qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData()) }; - return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, qmlName, + return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, uri, version, qmlName, &T::staticMetaObject, QmlPrivate::attachedPropertiesFunc<T>(), QmlPrivate::attachedPropertiesMetaObject<T>(), diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 7d9e30f..1055387 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -639,7 +639,7 @@ void QmlAbstractAnimation::timelineComplete() \l{xmlPauseAnimation} {<PauseAnimation>}. */ -QML_DEFINE_TYPE(QmlPauseAnimation,PauseAnimation) +QML_DEFINE_TYPE(Qt,4.6,PauseAnimation,QmlPauseAnimation) QmlPauseAnimation::QmlPauseAnimation(QObject *parent) : QmlAbstractAnimation(*(new QmlPauseAnimationPrivate), parent) { @@ -771,7 +771,7 @@ void QmlColorAnimation::setTo(const QColor &t) QmlPropertyAnimation::setTo(t); } -QML_DEFINE_TYPE(QmlColorAnimation,ColorAnimation) +QML_DEFINE_TYPE(Qt,4.6,ColorAnimation,QmlColorAnimation) /*! \qmlclass RunScriptAction QmlRunScriptAction @@ -865,7 +865,7 @@ QAbstractAnimation *QmlRunScriptAction::qtAnimation() return d->rsa; } -QML_DEFINE_TYPE(QmlRunScriptAction, RunScriptAction) +QML_DEFINE_TYPE(Qt,4.6,RunScriptAction,QmlRunScriptAction) /*! \qmlclass SetPropertyAction QmlSetPropertyAction @@ -1073,7 +1073,7 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlSetPropertyAction,SetPropertyAction) +QML_DEFINE_TYPE(Qt,4.6,SetPropertyAction,QmlSetPropertyAction) /*! \qmlclass ParentChangeAction QmlParentChangeAction @@ -1168,7 +1168,7 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlParentChangeAction,ParentChangeAction) +QML_DEFINE_TYPE(Qt,4.6,ParentChangeAction,QmlParentChangeAction) /*! \qmlclass NumberAnimation QmlNumberAnimation @@ -1246,7 +1246,7 @@ void QmlNumberAnimation::setTo(qreal t) QmlPropertyAnimation::setTo(t); } -QML_DEFINE_TYPE(QmlNumberAnimation,NumberAnimation) +QML_DEFINE_TYPE(Qt,4.6,NumberAnimation,QmlNumberAnimation) QmlAnimationGroup::QmlAnimationGroup(QObject *parent) : QmlAbstractAnimation(*(new QmlAnimationGroupPrivate), parent) @@ -1336,7 +1336,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation) +QML_DEFINE_TYPE(Qt,4.6,SequentialAnimation,QmlSequentialAnimation) /*! \qmlclass ParallelAnimation QmlParallelAnimation @@ -1418,7 +1418,7 @@ void QmlParallelAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlParallelAnimation,ParallelAnimation) +QML_DEFINE_TYPE(Qt,4.6,ParallelAnimation,QmlParallelAnimation) //convert a variant from string type to another animatable type void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type) @@ -1881,6 +1881,6 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlPropertyAnimation,PropertyAnimation) +QML_DEFINE_TYPE(Qt,4.6,PropertyAnimation,QmlPropertyAnimation) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index 7493b12..271be81 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -63,7 +63,7 @@ public: QmlNullableValue<QVariant> value; }; -QML_DEFINE_TYPE(QmlBind,Bind) +QML_DEFINE_TYPE(Qt,4.6,Bind,QmlBind) /*! \qmlclass Bind QmlBind \brief The Bind element allows arbitrary property bindings to be created. diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index 95f4573..e8879f6 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -294,6 +294,6 @@ void QmlConnection::setSignal(const QString& sig) connectIfValid(); } -QML_DEFINE_TYPE(QmlConnection,Connection) +QML_DEFINE_TYPE(Qt,4.6,Connection,QmlConnection) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index 63b6307..82e8f0e 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlFollow,Follow) +QML_DEFINE_TYPE(Qt,4.6,Follow,QmlFollow) class QmlFollowPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmlfont.cpp b/src/declarative/util/qmlfont.cpp index 3075b82..6e4557f 100644 --- a/src/declarative/util/qmlfont.cpp +++ b/src/declarative/util/qmlfont.cpp @@ -51,7 +51,7 @@ public: QFont font; }; -QML_DEFINE_TYPE(QmlFont,Font) +QML_DEFINE_TYPE(Qt,4.6,Font,QmlFont) /*! \internal diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 0c167c0..aa6cc2c 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -500,14 +500,14 @@ void QmlListModelParser::setCustomData(QObject *obj, const QByteArray &d) } } -QML_DEFINE_CUSTOM_TYPE(QmlListModel, ListModel, QmlListModelParser) +QML_DEFINE_CUSTOM_TYPE(Qt, 4.6, ListModel, QmlListModel, QmlListModelParser) // ### FIXME class QmlListElement : public QObject { Q_OBJECT }; -QML_DEFINE_TYPE(QmlListElement,ListElement) +QML_DEFINE_TYPE(Qt,4.6,ListElement,QmlListElement) static void dump(ModelNode *node, int ind) { diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp index eec769e..d4bf0f9 100644 --- a/src/declarative/util/qmlpackage.cpp +++ b/src/declarative/util/qmlpackage.cpp @@ -147,7 +147,7 @@ QmlPackageAttached *QmlPackage::qmlAttachedProperties(QObject *o) return new QmlPackageAttached(o); } -QML_DEFINE_TYPE(QmlPackage, Package) +QML_DEFINE_TYPE(Qt,4.6,Package,QmlPackage) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp index 40cfa71..507568d 100644 --- a/src/declarative/util/qmlpalette.cpp +++ b/src/declarative/util/qmlpalette.cpp @@ -52,7 +52,7 @@ public: QPalette::ColorGroup group; }; -QML_DEFINE_TYPE(QmlPalette,Palette) +QML_DEFINE_TYPE(Qt,4.6,Palette,QmlPalette) /*! \internal diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp index 7199341..5aa87d7 100644 --- a/src/declarative/util/qmlscript.cpp +++ b/src/declarative/util/qmlscript.cpp @@ -99,7 +99,7 @@ public: avoided. */ -QML_DEFINE_TYPE(QmlScript,Script) +QML_DEFINE_TYPE(Qt,4.6,Script,QmlScript) QmlScript::QmlScript(QObject *parent) : QObject(*(new QmlScriptPrivate), parent) { } diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp index ffd1e6a..b067fcf 100644 --- a/src/declarative/util/qmlsetproperties.cpp +++ b/src/declarative/util/qmlsetproperties.cpp @@ -357,6 +357,6 @@ void QmlSetProperties::setIsExplicit(bool e) d->isExplicit = e; } -QML_DEFINE_CUSTOM_TYPE(QmlSetProperties,SetProperties,QmlSetPropertiesParser) +QML_DEFINE_CUSTOM_TYPE(Qt, 4.6, SetProperties, QmlSetProperties, QmlSetPropertiesParser) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 2c44c86..351325f 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -126,7 +126,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent) \sa {states-transitions}{States and Transitions} */ -QML_DEFINE_TYPE(QmlState,State) +QML_DEFINE_TYPE(Qt,4.6,State,QmlState) QmlState::QmlState(QObject *parent) : QObject(*(new QmlStatePrivate), parent) { diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index 946569c..8977642 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG); -QML_DEFINE_TYPE(QmlStateGroup,StateGroup) +QML_DEFINE_TYPE(Qt,4.6,StateGroup,QmlStateGroup) class QmlStateGroupPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index dc7fef6..4b1b63f 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -122,7 +122,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent) \brief The ParentChange element allows you to reparent an object in a state. */ -QML_DEFINE_TYPE(QmlParentChange,ParentChange) +QML_DEFINE_TYPE(Qt,4.6,ParentChange,QmlParentChange) QmlParentChange::QmlParentChange(QObject *parent) : QmlStateOperation(*(new QmlParentChangePrivate), parent) { @@ -209,7 +209,7 @@ public: \qmlclass RunScript QmlRunScript \brief The RunScript element allows you to run a script in a state. */ -QML_DEFINE_TYPE(QmlRunScript,RunScript) +QML_DEFINE_TYPE(Qt,4.6,RunScript,QmlRunScript) QmlRunScript::QmlRunScript(QObject *parent) : QmlStateOperation(*(new QmlRunScriptPrivate), parent) { diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp index 4af83d3..caf316a 100644 --- a/src/declarative/util/qmltimer.cpp +++ b/src/declarative/util/qmltimer.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlTimer,Timer) +QML_DEFINE_TYPE(Qt,4.6,Timer,QmlTimer) class QmlTimerPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index dffa6b5..431059f 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -135,7 +135,7 @@ void ParallelAnimationWrapper::updateState(QAbstractAnimation::State oldState, Q } -QML_DEFINE_TYPE(QmlTransition,Transition) +QML_DEFINE_TYPE(Qt,4.6,Transition,QmlTransition) QmlTransition::QmlTransition(QObject *parent) : QObject(*(new QmlTransitionPrivate), parent) { diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp index f2d8dbc..217ecf7 100644 --- a/src/declarative/widgets/graphicslayouts.cpp +++ b/src/declarative/widgets/graphicslayouts.cpp @@ -89,7 +89,7 @@ private: Qt::Alignment _alignment; }; -QML_DEFINE_TYPE(QGraphicsLinearLayoutStretchItemObject,QGraphicsLinearLayoutStretchItem) +QML_DEFINE_TYPE(Qt,4.6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject) QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent) : QObject(parent) @@ -103,7 +103,7 @@ QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, cons return QSizeF(); } -QML_DEFINE_TYPE(QGraphicsLinearLayoutObject,QGraphicsLinearLayout) +QML_DEFINE_TYPE(Qt,4.6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject) QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent) : QObject(parent), _children(this) @@ -246,7 +246,7 @@ private: Qt::Alignment _alignment; }; -QML_DEFINE_TYPE(QGraphicsGridLayoutObject,QGraphicsGridLayout) +QML_DEFINE_TYPE(Qt,4.6,QGraphicsGridLayout,QGraphicsGridLayoutObject) QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent) diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp index e7d01e3..782ffba 100644 --- a/src/declarative/widgets/graphicswidgets.cpp +++ b/src/declarative/widgets/graphicswidgets.cpp @@ -59,7 +59,7 @@ public: static_cast<QGraphicsView *>(parent())->setScene(scene); } }; -QML_DEFINE_EXTENDED_TYPE(QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI) class QGraphicsSceneDeclarativeUI : public QObject { @@ -111,7 +111,7 @@ private: }; Children _children; }; -QML_DEFINE_EXTENDED_TYPE(QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI) class QGraphicsWidgetDeclarativeUI : public QObject { @@ -164,7 +164,7 @@ private: QmlConcreteList<QObject *> _data; }; -QML_DEFINE_EXTENDED_TYPE(QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI) QML_DEFINE_INTERFACE(QGraphicsItem) diff --git a/tests/auto/declarative/anchors/data/anchors.qml b/tests/auto/declarative/anchors/data/anchors.qml index 6a87390..122d440 100644 --- a/tests/auto/declarative/anchors/data/anchors.qml +++ b/tests/auto/declarative/anchors/data/anchors.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "white" width: 240 diff --git a/tests/auto/declarative/anchors/data/illegal1.qml b/tests/auto/declarative/anchors/data/illegal1.qml index 635bf95..1d23110 100644 --- a/tests/auto/declarative/anchors/data/illegal1.qml +++ b/tests/auto/declarative/anchors/data/illegal1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: rect width: 120; height: 200; color: "white" diff --git a/tests/auto/declarative/anchors/data/illegal2.qml b/tests/auto/declarative/anchors/data/illegal2.qml index 425d0e4..9f81b91 100644 --- a/tests/auto/declarative/anchors/data/illegal2.qml +++ b/tests/auto/declarative/anchors/data/illegal2.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: rect width: 120; height: 200; color: "white" diff --git a/tests/auto/declarative/anchors/data/illegal3.qml b/tests/auto/declarative/anchors/data/illegal3.qml index fa48b78..4f07456 100644 --- a/tests/auto/declarative/anchors/data/illegal3.qml +++ b/tests/auto/declarative/anchors/data/illegal3.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: rect width: 120; height: 200; color: "white" diff --git a/tests/auto/declarative/anchors/data/loop1.qml b/tests/auto/declarative/anchors/data/loop1.qml index a4de1bf..adc5a10 100644 --- a/tests/auto/declarative/anchors/data/loop1.qml +++ b/tests/auto/declarative/anchors/data/loop1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: rect width: 120; height: 200; color: "white" diff --git a/tests/auto/declarative/anchors/data/loop2.qml b/tests/auto/declarative/anchors/data/loop2.qml index 4b2c74e..a6856f8 100644 --- a/tests/auto/declarative/anchors/data/loop2.qml +++ b/tests/auto/declarative/anchors/data/loop2.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: container; width: 600; diff --git a/tests/auto/declarative/animations/data/badproperty1.qml b/tests/auto/declarative/animations/data/badproperty1.qml index dc35775..b88cd6f 100644 --- a/tests/auto/declarative/animations/data/badproperty1.qml +++ b/tests/auto/declarative/animations/data/badproperty1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Wrapper width: 240 diff --git a/tests/auto/declarative/animations/data/badtype1.qml b/tests/auto/declarative/animations/data/badtype1.qml index 691d2b3..00db39e 100644 --- a/tests/auto/declarative/animations/data/badtype1.qml +++ b/tests/auto/declarative/animations/data/badtype1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240 height: 320 diff --git a/tests/auto/declarative/animations/data/badtype2.qml b/tests/auto/declarative/animations/data/badtype2.qml index aa248a6..eeaaefc 100644 --- a/tests/auto/declarative/animations/data/badtype2.qml +++ b/tests/auto/declarative/animations/data/badtype2.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240 height: 320 diff --git a/tests/auto/declarative/animations/data/badtype3.qml b/tests/auto/declarative/animations/data/badtype3.qml index f1a89b6..cbb1a4d 100644 --- a/tests/auto/declarative/animations/data/badtype3.qml +++ b/tests/auto/declarative/animations/data/badtype3.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240 height: 320 diff --git a/tests/auto/declarative/animations/data/badtype4.qml b/tests/auto/declarative/animations/data/badtype4.qml index fa4eebe..3e046fc 100644 --- a/tests/auto/declarative/animations/data/badtype4.qml +++ b/tests/auto/declarative/animations/data/badtype4.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Wrapper width: 240 diff --git a/tests/auto/declarative/animations/data/color.qml b/tests/auto/declarative/animations/data/color.qml index 051e0e1..8a9ab8a 100644 --- a/tests/auto/declarative/animations/data/color.qml +++ b/tests/auto/declarative/animations/data/color.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240 height: 320 diff --git a/tests/auto/declarative/animations/data/dotproperty.qml b/tests/auto/declarative/animations/data/dotproperty.qml index 2cfcefe..25076b8 100644 --- a/tests/auto/declarative/animations/data/dotproperty.qml +++ b/tests/auto/declarative/animations/data/dotproperty.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Wrapper width: 240 diff --git a/tests/auto/declarative/animations/data/mixedtype1.qml b/tests/auto/declarative/animations/data/mixedtype1.qml index 415bbfb..8b8262b 100644 --- a/tests/auto/declarative/animations/data/mixedtype1.qml +++ b/tests/auto/declarative/animations/data/mixedtype1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Wrapper width: 240 diff --git a/tests/auto/declarative/animations/data/mixedtype2.qml b/tests/auto/declarative/animations/data/mixedtype2.qml index 0e9fb8d..95b8ed7 100644 --- a/tests/auto/declarative/animations/data/mixedtype2.qml +++ b/tests/auto/declarative/animations/data/mixedtype2.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: Wrapper width: 240 diff --git a/tests/auto/declarative/animations/data/number.qml b/tests/auto/declarative/animations/data/number.qml index feb551b..bde1168 100644 --- a/tests/auto/declarative/animations/data/number.qml +++ b/tests/auto/declarative/animations/data/number.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240 height: 320 diff --git a/tests/auto/declarative/layouts/data/grid-margin.qml b/tests/auto/declarative/layouts/data/grid-margin.qml index bae47f9..a49dc85 100644 --- a/tests/auto/declarative/layouts/data/grid-margin.qml +++ b/tests/auto/declarative/layouts/data/grid-margin.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/grid-spacing-margin.qml b/tests/auto/declarative/layouts/data/grid-spacing-margin.qml index 100d8c5..d2fe4f6 100644 --- a/tests/auto/declarative/layouts/data/grid-spacing-margin.qml +++ b/tests/auto/declarative/layouts/data/grid-spacing-margin.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/grid-spacing.qml b/tests/auto/declarative/layouts/data/grid-spacing.qml index 494127b..704e3f2 100644 --- a/tests/auto/declarative/layouts/data/grid-spacing.qml +++ b/tests/auto/declarative/layouts/data/grid-spacing.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/grid.qml b/tests/auto/declarative/layouts/data/grid.qml index 598915f..2f60f16 100644 --- a/tests/auto/declarative/layouts/data/grid.qml +++ b/tests/auto/declarative/layouts/data/grid.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/horizontal-margin.qml b/tests/auto/declarative/layouts/data/horizontal-margin.qml index 8bf2329..a96db02 100644 --- a/tests/auto/declarative/layouts/data/horizontal-margin.qml +++ b/tests/auto/declarative/layouts/data/horizontal-margin.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml b/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml index 79652f6..82957be 100644 --- a/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml +++ b/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/horizontal-spacing.qml b/tests/auto/declarative/layouts/data/horizontal-spacing.qml index 5130e4a..8c55ae9 100644 --- a/tests/auto/declarative/layouts/data/horizontal-spacing.qml +++ b/tests/auto/declarative/layouts/data/horizontal-spacing.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/horizontal.qml b/tests/auto/declarative/layouts/data/horizontal.qml index 7ad6b55..286b90b 100644 --- a/tests/auto/declarative/layouts/data/horizontal.qml +++ b/tests/auto/declarative/layouts/data/horizontal.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/vertical-margin.qml b/tests/auto/declarative/layouts/data/vertical-margin.qml index ad34906..a7e10ea 100644 --- a/tests/auto/declarative/layouts/data/vertical-margin.qml +++ b/tests/auto/declarative/layouts/data/vertical-margin.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml b/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml index 5de50b3..828ae61 100644 --- a/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml +++ b/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/vertical-spacing.qml b/tests/auto/declarative/layouts/data/vertical-spacing.qml index c364e3f..8d3e86f 100644 --- a/tests/auto/declarative/layouts/data/vertical-spacing.qml +++ b/tests/auto/declarative/layouts/data/vertical-spacing.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/layouts/data/vertical.qml b/tests/auto/declarative/layouts/data/vertical.qml index 50931cd..960f10a 100644 --- a/tests/auto/declarative/layouts/data/vertical.qml +++ b/tests/auto/declarative/layouts/data/vertical.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 640 height: 480 diff --git a/tests/auto/declarative/listview/data/listview.qml b/tests/auto/declarative/listview/data/listview.qml index 891f9a8..3e7f106 100644 --- a/tests/auto/declarative/listview/data/listview.qml +++ b/tests/auto/declarative/listview/data/listview.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240 height: 320 diff --git a/tests/auto/declarative/pathview/data/pathview.qml b/tests/auto/declarative/pathview/data/pathview.qml index 0fec1e9..5bf2085 100644 --- a/tests/auto/declarative/pathview/data/pathview.qml +++ b/tests/auto/declarative/pathview/data/pathview.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 240 height: 320 diff --git a/tests/auto/declarative/qfxtextedit/data/cursorTest.qml b/tests/auto/declarative/qfxtextedit/data/cursorTest.qml index 10ac2fd..25e53d0 100644 --- a/tests/auto/declarative/qfxtextedit/data/cursorTest.qml +++ b/tests/auto/declarative/qfxtextedit/data/cursorTest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: 300; height: 300; color: "white" TextEdit { text: "Hello world!"; focusable: true; id: textEditObject resources: [ Component { id:cursor; Item { id:cursorInstance } } ] diff --git a/tests/auto/declarative/qmldom/data/MyComponent.qml b/tests/auto/declarative/qmldom/data/MyComponent.qml index 0940753..1472f01 100644 --- a/tests/auto/declarative/qmldom/data/MyComponent.qml +++ b/tests/auto/declarative/qmldom/data/MyComponent.qml @@ -1,2 +1,4 @@ +import Qt 4.6 + Item { } diff --git a/tests/auto/declarative/qmldom/data/importdir/Bar.qml b/tests/auto/declarative/qmldom/data/importdir/Bar.qml index e69de29..2d1a4a3 100644 --- a/tests/auto/declarative/qmldom/data/importdir/Bar.qml +++ b/tests/auto/declarative/qmldom/data/importdir/Bar.qml @@ -0,0 +1,2 @@ +import Qt 4.6 + diff --git a/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml b/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml index e69de29..2d1a4a3 100644 --- a/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml +++ b/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml @@ -0,0 +1,2 @@ +import Qt 4.6 + diff --git a/tests/auto/declarative/qmldom/data/top.qml b/tests/auto/declarative/qmldom/data/top.qml index 142d4c8..2681993 100644 --- a/tests/auto/declarative/qmldom/data/top.qml +++ b/tests/auto/declarative/qmldom/data/top.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + MyComponent { width: 100 height: 100 diff --git a/tests/auto/declarative/qmlparser/FailingComponent.qml b/tests/auto/declarative/qmlparser/FailingComponent.qml index b604e0b..1c01e3d 100644 --- a/tests/auto/declarative/qmlparser/FailingComponent.qml +++ b/tests/auto/declarative/qmlparser/FailingComponent.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Object { a: 10 } diff --git a/tests/auto/declarative/qmlparser/MyComponent.qml b/tests/auto/declarative/qmlparser/MyComponent.qml index 8a9f57d..5caa547 100644 --- a/tests/auto/declarative/qmlparser/MyComponent.qml +++ b/tests/auto/declarative/qmlparser/MyComponent.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + MyQmlObject { property real x; property real y; diff --git a/tests/auto/declarative/qmlparser/MyContainerComponent.qml b/tests/auto/declarative/qmlparser/MyContainerComponent.qml index 5746928..cf17dcc 100644 --- a/tests/auto/declarative/qmlparser/MyContainerComponent.qml +++ b/tests/auto/declarative/qmlparser/MyContainerComponent.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + MyContainer { property int x } diff --git a/tests/auto/declarative/repeater/data/repeater.qml b/tests/auto/declarative/repeater/data/repeater.qml index 2498646..57b1183 100644 --- a/tests/auto/declarative/repeater/data/repeater.qml +++ b/tests/auto/declarative/repeater/data/repeater.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: container width: 240 diff --git a/tests/auto/declarative/simplecanvasitem/data/test.qml b/tests/auto/declarative/simplecanvasitem/data/test.qml index d206a6b..8fbbc2e 100644 --- a/tests/auto/declarative/simplecanvasitem/data/test.qml +++ b/tests/auto/declarative/simplecanvasitem/data/test.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { width: 320 height: 480 diff --git a/tests/auto/declarative/visual/ListView/basic1/basic1.qml b/tests/auto/declarative/visual/ListView/basic1/basic1.qml index d9cd030..b1309ca 100644 --- a/tests/auto/declarative/visual/ListView/basic1/basic1.qml +++ b/tests/auto/declarative/visual/ListView/basic1/basic1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 200 diff --git a/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/ListView/basic2/basic2.qml b/tests/auto/declarative/visual/ListView/basic2/basic2.qml index e5996cf..fa20332 100644 --- a/tests/auto/declarative/visual/ListView/basic2/basic2.qml +++ b/tests/auto/declarative/visual/ListView/basic2/basic2.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 200 diff --git a/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/ListView/basic3/basic3.qml b/tests/auto/declarative/visual/ListView/basic3/basic3.qml index 98aa5fb..aee252f 100644 --- a/tests/auto/declarative/visual/ListView/basic3/basic3.qml +++ b/tests/auto/declarative/visual/ListView/basic3/basic3.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 200 diff --git a/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/ListView/basic4/basic4.qml b/tests/auto/declarative/visual/ListView/basic4/basic4.qml index 9e5229a..76c5723 100644 --- a/tests/auto/declarative/visual/ListView/basic4/basic4.qml +++ b/tests/auto/declarative/visual/ListView/basic4/basic4.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 200 diff --git a/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml index 69c5d81..2086648 100644 --- a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml +++ b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 320 diff --git a/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml b/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml index 1454949..cd096d7 100644 --- a/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml index cb631d4..d0c988c 100644 --- a/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml +++ b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: mainrect width: 200; height: 200 diff --git a/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml index 0eb8b12..0926b2c 100644 --- a/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/easing/easing.qml b/tests/auto/declarative/visual/easing/easing.qml index 7a58276..7bd6c8f 100644 --- a/tests/auto/declarative/visual/easing/easing.qml +++ b/tests/auto/declarative/visual/easing/easing.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: item width: 600 diff --git a/tests/auto/declarative/visual/flickable/Day.qml b/tests/auto/declarative/visual/flickable/Day.qml index 6af7b1c..549a9a0 100644 --- a/tests/auto/declarative/visual/flickable/Day.qml +++ b/tests/auto/declarative/visual/flickable/Day.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { property string day diff --git a/tests/auto/declarative/visual/flickable/flickable.qml b/tests/auto/declarative/visual/flickable/flickable.qml index c466dfc..24931de 100644 --- a/tests/auto/declarative/visual/flickable/flickable.qml +++ b/tests/auto/declarative/visual/flickable/flickable.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "lightSteelBlue" width: 600 diff --git a/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml b/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml index de3f32e..40b300d 100644 --- a/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml index e0880f0..2abe83f 100644 --- a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml +++ b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { id: rect width: 120 diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/qfxtext/elide/elide.qml b/tests/auto/declarative/visual/qfxtext/elide/elide.qml index 23e6885..0372a9c 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/elide.qml +++ b/tests/auto/declarative/visual/qfxtext/elide/elide.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { width: contents.width height: contents.height diff --git a/tests/auto/declarative/visual/repeater/basic1/basic1.qml b/tests/auto/declarative/visual/repeater/basic1/basic1.qml index ba8f44d..c803de9 100644 --- a/tests/auto/declarative/visual/repeater/basic1/basic1.qml +++ b/tests/auto/declarative/visual/repeater/basic1/basic1.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 300 diff --git a/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/repeater/basic2/basic2.qml b/tests/auto/declarative/visual/repeater/basic2/basic2.qml index d975ea4..bcad407 100644 --- a/tests/auto/declarative/visual/repeater/basic2/basic2.qml +++ b/tests/auto/declarative/visual/repeater/basic2/basic2.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 300 diff --git a/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/repeater/basic3/basic3.qml b/tests/auto/declarative/visual/repeater/basic3/basic3.qml index cecba33..223e5e8 100644 --- a/tests/auto/declarative/visual/repeater/basic3/basic3.qml +++ b/tests/auto/declarative/visual/repeater/basic3/basic3.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 300 diff --git a/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml index 47d36c3..8fd963b 100644 --- a/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/repeater/basic4/basic4.qml b/tests/auto/declarative/visual/repeater/basic4/basic4.qml index 050a2c5..fd78ba2 100644 --- a/tests/auto/declarative/visual/repeater/basic4/basic4.qml +++ b/tests/auto/declarative/visual/repeater/basic4/basic4.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Rect { color: "blue" width: 300 diff --git a/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml b/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml index 6d900f5..7c21d0f 100644 --- a/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml +++ b/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + TestLog { TestFullFrame { time: 0 diff --git a/tools/qmldebugger/engines.qml b/tools/qmldebugger/engines.qml index 2435f10..fc364e2 100644 --- a/tools/qmldebugger/engines.qml +++ b/tools/qmldebugger/engines.qml @@ -1,3 +1,5 @@ +import Qt 4.6 + Item { height: 100 id: Root |