diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 12:36:50 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 12:36:50 +0200 |
| commit | c9057924dfa5da4d18030720431a92d2593f85df (patch) | |
| tree | 1cef0e0137e1d4bb796f0507b72e95ab30c96e20 /.gitignore | |
| parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
| parent | d395903e4d061a30117f7b925bdad41771a29067 (diff) | |
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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 24c173c557..04f6e7e865 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ bin/lrelease* bin/lupdate* bin/lconvert* bin/moc* +bin/makeqpf* bin/pixeltool* bin/qmake* bin/qdoc3* |