diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 10:36:50 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 10:36:50 (GMT) |
commit | c9057924dfa5da4d18030720431a92d2593f85df (patch) | |
tree | 1cef0e0137e1d4bb796f0507b72e95ab30c96e20 /examples/declarative/toys | |
parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
parent | d395903e4d061a30117f7b925bdad41771a29067 (diff) | |
download | Qt-c9057924dfa5da4d18030720431a92d2593f85df.zip Qt-c9057924dfa5da4d18030720431a92d2593f85df.tar.gz Qt-c9057924dfa5da4d18030720431a92d2593f85df.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits)
Doc improvements
Disable mouse-based selection in TextInput/TextEdit
Rename qml executable to qmlviewer
Don't crash if the target parent is destroyed.
Introduce a threaded interpreter for QML binding bytecode
Bug moved.
doc
doc
Remove image example (covered in class docs)
When changing Loader source, remove old item from scene immediately.
Add missing .qmlproject files
Fix folderlistmodel with qt namespace
Renaming "Qml Launcher" back to "QML Viewer"
Rename some examples: proxyviewer -> networkaccessmanagerfactory,
Regression fix for Loader anchors not working
Make Qt.include() work for js files that have '.pragma library'
doc fix
Improve docs for Qt.quit()
Prevent assignment of values (string, number, bool) to signal handlers.
Make sure strings are escaped when returned via asScript.
...
Diffstat (limited to 'examples/declarative/toys')
-rw-r--r-- | examples/declarative/toys/corkboards/Day.qml (renamed from examples/declarative/toys/velocity/Day.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/corkboards/cork.jpg (renamed from examples/declarative/toys/velocity/cork.jpg) | bin | 149337 -> 149337 bytes | |||
-rw-r--r-- | examples/declarative/toys/corkboards/corkboards.qml (renamed from examples/declarative/toys/velocity/velocity.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/corkboards/corkboards.qmlproject (renamed from examples/declarative/toys/velocity/velocity.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/corkboards/note-yellow.png (renamed from examples/declarative/toys/velocity/note-yellow.png) | bin | 54559 -> 54559 bytes | |||
-rw-r--r-- | examples/declarative/toys/corkboards/tack.png (renamed from examples/declarative/toys/velocity/tack.png) | bin | 7282 -> 7282 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/dynamicscene.qml (renamed from examples/declarative/toys/dynamic/dynamic.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/dynamicscene.qmlproject (renamed from examples/declarative/toys/dynamic/dynamic.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/NOTE (renamed from examples/declarative/toys/dynamic/images/NOTE) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/face-smile.png (renamed from examples/declarative/toys/dynamic/images/face-smile.png) | bin | 15408 -> 15408 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/moon.png (renamed from examples/declarative/toys/dynamic/images/moon.png) | bin | 1757 -> 1757 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/rabbit_brown.png (renamed from examples/declarative/toys/dynamic/images/rabbit_brown.png) | bin | 1245 -> 1245 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/rabbit_bw.png (renamed from examples/declarative/toys/dynamic/images/rabbit_bw.png) | bin | 1759 -> 1759 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/star.png (renamed from examples/declarative/toys/dynamic/images/star.png) | bin | 349 -> 349 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/sun.png (renamed from examples/declarative/toys/dynamic/images/sun.png) | bin | 8153 -> 8153 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/images/tree_s.png (renamed from examples/declarative/toys/dynamic/images/tree_s.png) | bin | 3406 -> 3406 bytes | |||
-rw-r--r-- | examples/declarative/toys/dynamicscene/qml/Button.qml (renamed from examples/declarative/toys/dynamic/qml/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/qml/PaletteItem.qml (renamed from examples/declarative/toys/dynamic/qml/PaletteItem.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml (renamed from examples/declarative/toys/dynamic/qml/PerspectiveItem.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/qml/Sun.qml (renamed from examples/declarative/toys/dynamic/qml/Sun.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/qml/itemCreation.js (renamed from examples/declarative/toys/dynamic/qml/itemCreation.js) | 0 |
21 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/toys/velocity/Day.qml b/examples/declarative/toys/corkboards/Day.qml index 350c1c4..350c1c4 100644 --- a/examples/declarative/toys/velocity/Day.qml +++ b/examples/declarative/toys/corkboards/Day.qml diff --git a/examples/declarative/toys/velocity/cork.jpg b/examples/declarative/toys/corkboards/cork.jpg Binary files differindex 160bc00..160bc00 100644 --- a/examples/declarative/toys/velocity/cork.jpg +++ b/examples/declarative/toys/corkboards/cork.jpg diff --git a/examples/declarative/toys/velocity/velocity.qml b/examples/declarative/toys/corkboards/corkboards.qml index 871bafc..871bafc 100644 --- a/examples/declarative/toys/velocity/velocity.qml +++ b/examples/declarative/toys/corkboards/corkboards.qml diff --git a/examples/declarative/toys/velocity/velocity.qmlproject b/examples/declarative/toys/corkboards/corkboards.qmlproject index d4909f8..d4909f8 100644 --- a/examples/declarative/toys/velocity/velocity.qmlproject +++ b/examples/declarative/toys/corkboards/corkboards.qmlproject diff --git a/examples/declarative/toys/velocity/note-yellow.png b/examples/declarative/toys/corkboards/note-yellow.png Binary files differindex 8ddecc8..8ddecc8 100644 --- a/examples/declarative/toys/velocity/note-yellow.png +++ b/examples/declarative/toys/corkboards/note-yellow.png diff --git a/examples/declarative/toys/velocity/tack.png b/examples/declarative/toys/corkboards/tack.png Binary files differindex cef2d1c..cef2d1c 100644 --- a/examples/declarative/toys/velocity/tack.png +++ b/examples/declarative/toys/corkboards/tack.png diff --git a/examples/declarative/toys/dynamic/dynamic.qml b/examples/declarative/toys/dynamicscene/dynamicscene.qml index 52c7c1e..52c7c1e 100644 --- a/examples/declarative/toys/dynamic/dynamic.qml +++ b/examples/declarative/toys/dynamicscene/dynamicscene.qml diff --git a/examples/declarative/toys/dynamic/dynamic.qmlproject b/examples/declarative/toys/dynamicscene/dynamicscene.qmlproject index d4909f8..d4909f8 100644 --- a/examples/declarative/toys/dynamic/dynamic.qmlproject +++ b/examples/declarative/toys/dynamicscene/dynamicscene.qmlproject diff --git a/examples/declarative/toys/dynamic/images/NOTE b/examples/declarative/toys/dynamicscene/images/NOTE index fcd87f9..fcd87f9 100644 --- a/examples/declarative/toys/dynamic/images/NOTE +++ b/examples/declarative/toys/dynamicscene/images/NOTE diff --git a/examples/declarative/toys/dynamic/images/face-smile.png b/examples/declarative/toys/dynamicscene/images/face-smile.png Binary files differindex 3d66d72..3d66d72 100644 --- a/examples/declarative/toys/dynamic/images/face-smile.png +++ b/examples/declarative/toys/dynamicscene/images/face-smile.png diff --git a/examples/declarative/toys/dynamic/images/moon.png b/examples/declarative/toys/dynamicscene/images/moon.png Binary files differindex 1c0d606..1c0d606 100644 --- a/examples/declarative/toys/dynamic/images/moon.png +++ b/examples/declarative/toys/dynamicscene/images/moon.png diff --git a/examples/declarative/toys/dynamic/images/rabbit_brown.png b/examples/declarative/toys/dynamicscene/images/rabbit_brown.png Binary files differindex ebfdeed..ebfdeed 100644 --- a/examples/declarative/toys/dynamic/images/rabbit_brown.png +++ b/examples/declarative/toys/dynamicscene/images/rabbit_brown.png diff --git a/examples/declarative/toys/dynamic/images/rabbit_bw.png b/examples/declarative/toys/dynamicscene/images/rabbit_bw.png Binary files differindex 7bff9b9..7bff9b9 100644 --- a/examples/declarative/toys/dynamic/images/rabbit_bw.png +++ b/examples/declarative/toys/dynamicscene/images/rabbit_bw.png diff --git a/examples/declarative/toys/dynamic/images/star.png b/examples/declarative/toys/dynamicscene/images/star.png Binary files differindex 27ef924..27ef924 100644 --- a/examples/declarative/toys/dynamic/images/star.png +++ b/examples/declarative/toys/dynamicscene/images/star.png diff --git a/examples/declarative/toys/dynamic/images/sun.png b/examples/declarative/toys/dynamicscene/images/sun.png Binary files differindex 7713ca5..7713ca5 100644 --- a/examples/declarative/toys/dynamic/images/sun.png +++ b/examples/declarative/toys/dynamicscene/images/sun.png diff --git a/examples/declarative/toys/dynamic/images/tree_s.png b/examples/declarative/toys/dynamicscene/images/tree_s.png Binary files differindex 6eac35a..6eac35a 100644 --- a/examples/declarative/toys/dynamic/images/tree_s.png +++ b/examples/declarative/toys/dynamicscene/images/tree_s.png diff --git a/examples/declarative/toys/dynamic/qml/Button.qml b/examples/declarative/toys/dynamicscene/qml/Button.qml index 963a850..963a850 100644 --- a/examples/declarative/toys/dynamic/qml/Button.qml +++ b/examples/declarative/toys/dynamicscene/qml/Button.qml diff --git a/examples/declarative/toys/dynamic/qml/PaletteItem.qml b/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml index dcb5cc3..dcb5cc3 100644 --- a/examples/declarative/toys/dynamic/qml/PaletteItem.qml +++ b/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml diff --git a/examples/declarative/toys/dynamic/qml/PerspectiveItem.qml b/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml index c04d3dc..c04d3dc 100644 --- a/examples/declarative/toys/dynamic/qml/PerspectiveItem.qml +++ b/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml diff --git a/examples/declarative/toys/dynamic/qml/Sun.qml b/examples/declarative/toys/dynamicscene/qml/Sun.qml index 43dcb9a..43dcb9a 100644 --- a/examples/declarative/toys/dynamic/qml/Sun.qml +++ b/examples/declarative/toys/dynamicscene/qml/Sun.qml diff --git a/examples/declarative/toys/dynamic/qml/itemCreation.js b/examples/declarative/toys/dynamicscene/qml/itemCreation.js index 59750f3..59750f3 100644 --- a/examples/declarative/toys/dynamic/qml/itemCreation.js +++ b/examples/declarative/toys/dynamicscene/qml/itemCreation.js |