summaryrefslogtreecommitdiffstats
path: root/tools
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-198-576/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| * Rename qml executable to qmlviewerKai Koehne2010-05-192-2/+4
| | | | | | | | | | Revert the name of the 'qml' executable back to qmlviewer (QMLViewer on mac).
| * Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-185-18/+18
| | | | | | | | | | | | | | | | | | 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).
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-186-556/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-181-1/+5
| | |\
| | | * 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
| | * | Move stuff from QML viewer to plugins.Warwick Allison2010-05-175-555/+1
| | | |
| | * | 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 into 4.7Andrew den Exter2010-05-1838-1198/+1223
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| * | Print icon in doc pages has no effect.kh12010-05-173-0/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-10579 Reviewed-by: ck
| * | Assistant has unnecessary repaints when expand/collapse selected node.kh12010-05-171-7/+11
| |/ | | | | | | | | Task-number: QTBUG-10575 Reviewed-by: ck
| * Add new logo for QML Launcher (Mac OS X)Kai Koehne2010-05-143-0/+3
| |
| * Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-145-17/+18
| | | | | | | | | | | | | | | | The qml executable was first referred to as QML Viewer, then QML Runtime ... however, the latter one caused much confusion (see old version of qmlruntime.qdoc). Doc changes reviewed by Leena Miettinen.
| * Remove skins from qml launcher.Kai Koehne2010-05-144-271/+2
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-143-3/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Qt.include() support in worker scripts Only add "include" property in non-workerscript threads Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89 Reduce the chance of AnchorAnimation animating geometry changes it Add Qt.include() method for scoped inclusion of JavaScript files Fix crash in ParentAnimation. Revert "Fix crash in ParentAnimation." Symbian build fix to declarative auto and benchmark tests Revert "Use raster graphicssystem for qml.app on OS X." Fix crash in ParentAnimation. Minor declarative webview tweaks Removed dependency of QDeclarativeWebView to private Qt (Declarative) API Note that you need to unset a flag to create a visual item Follow-up on Flickable changes. ListModel::get() should return undefined if bad index specified Add an example spinner. Fix crash on remote content. Dates and variants are not considered nested objects
| | * Symbian build fix to declarative auto and benchmark testsJoona Petrell2010-05-142-2/+6
| | | | | | | | | | | | | | | Task-number: QTBUG-9491 Reviewed-by: Martin Jones
| | * Revert "Use raster graphicssystem for qml.app on OS X."Michael Brasser2010-05-141-1/+1
| | | | | | | | | | | | This reverts commit d412a77d1e9a1c6810e10dfa4a0a35a81391cf29.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1317-842/+824
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (159 commits) Doc: Adding loading image to search textbox qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. ...
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-1213-68/+347
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1217-840/+822
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits) qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively ...
| | | | * REG 4.7: Edit widgets icon no longer in toolbar.Friedemann Kleint2010-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10626 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
| | | | * Merge remote branch 'mainline/4.7' into 4.7Morten Johan Sørvig2010-05-128-61/+301
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tools/qdoc3/htmlgenerator.cpp
| | * | | | Doc: Adding loading image to search textboxMorten Engvoldsen2010-05-121-3/+3
| | | |/ / | | |/| |
| | * | | Doc: Update on web templateMorten Engvoldsen2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | Updated Form action
| | * | | Doc: Fixed tables and images for the new docsMorten Engvoldsen2010-05-111-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Added page.png to images dir. Fixed tables "generic"
| | * | | qdoc: Yet another revision of the top doc page.Martin Smith2010-05-112-35/+35
| | | | | | | | | | | | | | | | | | | | Still more to come.
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-102-2/+4
| | |\ \ \
| | | * | | Doc: Updates to the html template and javascriptMorten Engvoldsen2010-05-102-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| | * | | | qdoc: Another revision of the top doc page.Martin Smith2010-05-101-7/+6
| | |/ / / | | | | | | | | | | | | | | | More to come.
| | * | | qdoc: Fixed annotated list generation to use <td>, not <th>.Martin Smith2010-05-071-2/+2
| | | | |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-071-11/+49
| | |\ \ \
| | | * | | Doc: Chages to search feature, css and table orderMorten Engvoldsen2010-05-071-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the search results Fixed table css Added odd&even classes to tables generated by the thmlgenerator Reviewed-by: Morten Engvoldsen
| | * | | | qdoc: Reorganized examples panel.Martin Smith2010-05-071-9/+9
| | |/ / /
| | * | | Doc: updating html and search featureMorten Engvoldsen2010-05-061-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: implementing the search feature in the online docs Reviewed-by: Morten Engvoldsen
| | * | | doc: Second attempt to begin reorganizing the top doc page.Martin Smith2010-05-062-16/+14
| | | | | | | | | | | | | | | | | | | | This change actually changes the left panels. Much more to come.
| | * | | Doc: Changes to the HTML outputMorten Engvoldsen2010-05-052-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in css, htmlgenerator (removing redundant class names), updating html templates and updating js. Reviewed-by: Morten Engvoldsen
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-051-2/+2
| | |\ \ \
| | | * | | Fix build key on Windows with MinGW.Daniel Molkentin2010-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, rebuilt configure.exe Reviewed-by: Thiago Macieira
| | | * | | correct misleading note in configure on WindowsPeter Hartmann2010-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the option given in the note would not work if used as described. Reviewed-by: Zeno Albisser Task-number: QTBUG-2089
| | * | | | doc: Began reorganization of the top doc page.Martin Smith2010-05-051-13/+6
| | |/ / / | | | | | | | | | | | | | | | Much more to come.
| | * | | qdoc: Removed [module name] from class ref pages.Martin Smith2010-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | The module name is now a breadcrumb.
| | * | | Doc: Updating style and HTML in CSS and qdocMorten Engvoldsen2010-05-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding all classnames generated in qdoc to the CSS and removing redundant &nbsp; from htmlgenerator. Reviewed-by: Trust Me
| | * | | qdoc: Fixed the alphabet index in the compact list.Martin Smith2010-05-041-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it leaves out any letter that doesn't appear in the list. i.e. If there are no classes that begin with QJ... J does not appear in the alphabet index.
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-042-13/+37
| | |\ \ \
| | | * | | qdoc: Fixed some breadcrumbs.Martin Smith2010-05-041-0/+1
| | | | | |
| | | * | | qdoc: Fixed class list problem.Martin Smith2010-05-042-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-10373 Task: QTBUG-10382
| | * | | | Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-0413-770/+723
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index.qdoc updated the HTML to use sprites images - deleted obsolete images from templates/images images - added new images to templates/images styles.css - updated styles to handle index, sprites and templates correct. assistant.qdoconf - updates images designer.qdoconf - updates images linguist.qdoconf - updates images declarative.qdoconf - updates images qmake.qdoconf - updates images qt-build-docs.qdoconf - updates images qt-build-docs_zh_CN.qdoconf - updates images qt-defines.qdoconf - updates images qt.qdoconf - updates images qt_zh_CN.qdoconf - updates images qt-htmlTemplates.qdoconf - updated template to use sprites declarativeui.qdoc - removed <br> Reviewed-by: Trust Me
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-0310-28/+94
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-031-3/+7
| | | |\ \ \
| | | * | | | qdoc: Added more API topics. Are these important?Martin Smith2010-05-033-4/+11
| | | | | | |