summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19146-852/+2824
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1927-211/+698
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/listview/highlight.qml doc/src/snippets/declarative/listview/listview.qml
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-195-163/+242
| | |\
| | | * Rename qml executable to qmlviewerKai Koehne2010-05-193-6/+8
| | | | | | | | | | | | | | | | | | | | Revert the name of the 'qml' executable back to qmlviewer (QMLViewer on mac).
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-199-162/+439
| | | |\
| | | | * Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Roberto Raggi
| | | * | Don't crash if the target parent is destroyed.Martin Jones2010-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10755
| | * | | Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-197-10/+137
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Can still be turned back on, if people only want to target platforms where the behaviour is acceptable. Task-number: QTBUG-10684 Reviewed-by: Michael Brasser
| | * | Bug moved.Warwick Allison2010-05-191-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1979-127/+349
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | Conflicts: src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
| | | * When changing Loader source, remove old item from scene immediately.Martin Jones2010-05-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | This ensures focus is restored to the correct item. Task-number: QTBUG-10787
| | | * Fix folderlistmodel with qt namespaceMartin Jones2010-05-192-0/+14
| | | |
| | | * Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-1810-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the official name of the qml executable back to "Qt QML Viewer" - the original name before it got renamed to "QML Runtime" and then "QML Launcher". Also, the new Mac OS X bundle name is "QMLViewer" (without a space to ease command line use).
| | * | docWarwick Allison2010-05-191-0/+2
| | | |
| | * | docWarwick Allison2010-05-197-5/+204
| | | |
| * | | Doc improvementsBea Lam2010-05-1910-228/+244
| | | |
| * | | Remove image example (covered in class docs)Bea Lam2010-05-1911-183/+0
| | | |
| * | | Add missing .qmlproject filesBea Lam2010-05-193-0/+48
| | |/ | |/|
| * | Rename some examples: proxyviewer -> networkaccessmanagerfactory,Bea Lam2010-05-1835-35/+37
| | | | | | | | | | | | proxywidgets -> qwidgets, dynamic -> dynamicscene, velocity -> corkboards
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1879-281/+1883
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (22 commits) 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. Documentation git ignore stuff Test Qt.labs.folderlistmodel plugin Fix naming. Sometimes you own QNetworkReply, sometimes you don't. Rename files; fix test. Add parent parameter to QDeclarativeExpression constructor. Round correctly in binding optimizer Don't disable SmoothPixmapTransform in qDrawBorderPixmap() Photoviewer example fixes. Port from QListModelInterface to QAbstractListModel. Use QDeclarativeScriptString for ParentChange. Set raster + gl viewport as the default for OS X. Move stuff from QML viewer to plugins. ...
| | * | Regression fix for Loader anchors not workingJoona Petrell2010-05-183-0/+37
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10766 Reviewed-by: Yann Bodson
| | * | Make Qt.include() work for js files that have '.pragma library'Bea Lam2010-05-185-0/+36
| | | |
| | * | doc fixBea Lam2010-05-181-2/+2
| | | |
| | * | Improve docs for Qt.quit()Bea Lam2010-05-181-2/+3
| | | |
| | * | Prevent assignment of values (string, number, bool) to signal handlers.Michael Brasser2010-05-187-8/+10
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10764 Reviewed-by: Aaron Kennedy
| | * | Make sure strings are escaped when returned via asScript.Michael Brasser2010-05-186-30/+75
| | | | | | | | | | | | | | | | Makes 273024e58d90bb9b3a5da0161f884f1af22d75df more correct.
| | * | DocumentationYann Bodson2010-05-185-8/+68
| | |/
| | * git ignore stuffWarwick Allison2010-05-182-0/+2
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1828-42/+49
| | |\
| | | * Sometimes you own QNetworkReply, sometimes you don't.Aaron Kennedy2010-05-181-1/+1
| | | | | | | | | | | | | | | | God bless QNetworkAccessManager
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1825-37/+45
| | | |\
| | | | * Rename files; fix test.Michael Brasser2010-05-184-3/+4
| | | | |
| | | | * Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-1821-34/+41
| | | | | | | | | | | | | | | | | | | | Also rearrange the parameter order to be more clear.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1815-108/+179
| | | |\ \ | | | | |/
| | | * | Round correctly in binding optimizerAaron Kennedy2010-05-182-4/+3
| | | | | | | | | | | | | | | | | | | | QTBUG-9538
| | * | | Test Qt.labs.folderlistmodel pluginWarwick Allison2010-05-184-0/+136
| | | | |
| | * | | Fix naming.Warwick Allison2010-05-187-21/+6
| | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-183-33/+17
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-1817-114/+1322
| | | |\ \
| | | | * | Photoviewer example fixes.Yann Bodson2010-05-182-28/+16
| | | | |/
| | | * | Don't disable SmoothPixmapTransform in qDrawBorderPixmap()Martin Jones2010-05-181-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts part of ba8ff70b5ac7b68be57a4b63e439fd5a37c4aafa Drawing is far too ugly without SmoothPixmapTransform. Some glitches remain after this change, but they are due to a bug: QTBUG-10524 Task-number: QTBUG-5687 Reviewed-by: Aaron Kennedy
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1815-86/+1306
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Use QDeclarativeScriptString for ParentChange.Michael Brasser2010-05-1814-85/+1301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that scope resolution is correct, e.g. "width: parent.width-10;" in a ParentChange works correctly. Task-number: QTBUG-10675
| | | * | Set raster + gl viewport as the default for OS X.Michael Brasser2010-05-181-1/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | This setup seems to work around most rendering bugs and timing issues. Task-number: QTBUG-10544
| | * | Port from QListModelInterface to QAbstractListModel.Warwick Allison2010-05-182-51/+44
| | | |
| | * | Move stuff from QML viewer to plugins.Warwick Allison2010-05-179-22/+95
| | | |
| | * | docWarwick Allison2010-05-172-4/+24
| | | | | | | | | | | | | | | | models from plugins
| | * | Fix to work with file: URLs (eg. from qml -qmlbrowser)Warwick Allison2010-05-171-0/+1
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-19341-56727/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
| * | | removed test file, part of mediaservice removal.Kurt Korbatits2010-05-191-0/+0
| | | | | | | | | | | | | | | | Reviewed-by:Justin McPherson
generated by cgit v0.12 at 2025-09-06 13:54:52 (GMT)