summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1942-3080/+125
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (81 commits) Revert "Speed up QmlGraphicsItem::setParentItem." Fix dynamic example More strict type checking of ListElement properties. Fix tst_QmlGraphicsLoader::networkRequestUrl autotest. Fix tst_qmlgraphicstextedit::delegateLoading autotest Delete the QmlImageRequestHandler in the correct thread. Fix "AnimatedImage ignores Anchors setting" Remove unused function that breaks build on AIX. doc Add support for startDragDistance in qmlviewer. Add pixmap benchmarks and make cached rounded rect the same as Rectangle. Make QmlDom API internal Compile fix with namepaces Doc: reformulate why we build a button Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transition Doc: onExited, onEntered only work when button pressed or hoverEnabled Ensure visibleIndex and currentIndex are updated on itemsMoved(). QmlView API review. See QmlChanges.txt for details. Fix example after introduction of RotationAnimation. Animation doc fix. ...
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-1971-175/+9934
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1871-152/+9911
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| | * | Compile fix with namepaceshjk2010-02-181-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-8205
| | * | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-183-21/+21
| | | |
| * | | Add support for startDragDistance in qmlviewer.Kaj Grönholm2010-02-191-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding new parameter "-dragthreshold <size>" which sets mouse drag threshold in pixels. Using this makes qmlviewer more usable in touchscreen devices, where applications may require different thresholds. Merge-request: 6 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1741-3060/+101
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
| | * | qmlviewer: build on symbianMichael Brasser2010-02-171-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-8266
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-1/+1
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1639-3053/+89
| | | |\ \
| | | * | | Fix QTBUG-8090, improve original patch effectiveness.Warwick Allison2010-02-161-1/+1
| | | | | |
| | * | | | Conditionally link webkit on winceAaron Kennedy2010-02-171-1/+4
| | | |/ / | | |/| |
| | * | | Remove standalone QmlDebugger. It is now only available through theBea Lam2010-02-1623-3049/+1
| | | | | | | | | | | | | | | | | | | | plugin in the Creator repo.
| | * | | Mobility 404Wolfgang Beck2010-02-161-0/+4
| | | | |
| | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1621-23/+103
| | |/ /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1548-1056/+1968
| | |\ \
| | * | | Not exported in Qt 4.6.2, push to next release.Warwick Allison2010-02-151-5/+6
| | | | |
* | | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-1882-163/+9916
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| * | | | AIX has a #define for hz, so undef itThiago Macieira2010-02-171-0/+4
| | | | |
| * | | | Fix compilation with IBM xlC 7:Thiago Macieira2010-02-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "../../../../../include/QtCore/../../src/corelib/kernel/qmetatype.h", line 202.49: 1540-0062 (S) The incomplete class "QMetaTypeId<qdesigner_internal::ArrowKeyOperation>" must not be used as a qualifier. So move the Q_DECLARE_METATYPE before the use. Reviewed-By: hjk <qtc-committer@nokia.com>
| * | | | Fix compilation of Qt Assistant when WebKit isn't built.Thiago Macieira2010-02-174-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You need to ensure qconfig.h is included before you can check if QT_NO_WEBKIT is defined. Reviewed-by: kh1 <qt-info@nokia.com>
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1681-162/+9904
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| | * | | Fix copyright year.Jason McDonald2010-02-1634-34/+34
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Fix broken license headers.Jason McDonald2010-02-162-0/+15
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1345-128/+9855
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. ...
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1345-128/+9855
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. ...
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1245-128/+9855
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. ...
| | | | | * Add license header to this fileThiago Macieira2010-02-121-0/+41
| | | | | |
| | | | | * qdoc3: Completed handling of the new \pagekeywords command.Martin Smith2010-02-112-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7877
| | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1140-379/+9994
| | | | | |\
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1144-127/+9789
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8. qdoc: Removed debugging code. Doc: Updated the configuration file for the Simplified Chinese docs. qdoc: Standardized encoding names and updated the Chinese config files. Doc: Added Simplified Chinese documents and build rules for them. qdoc: Added support for different source and output character encodings. Doc: Synchronize configuration files for easier maintenance.
| | | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1086-6302/+2592
| | | | | | | |\
| | | | | | | * | qdoc: Added a build rule for the documentation - disabled by default.David Boddie2010-02-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | * | Doc: Added the qdoc manual to the repository for future maintenance.David Boddie2010-02-1014-0/+9262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | * | qdoc: Made a temporary fix for comment highlighting.David Boddie2010-02-091-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | * | Merge branch 'qdoc-i18n'David Boddie2010-02-0918-96/+298
| | | | | | | |\ \
| | | | | | | | * | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
| | | | | | | | * | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-082-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
| | | | | | | | * | qdoc: Removed debugging code.David Boddie2010-02-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | | * | Doc: Updated the configuration file for the Simplified Chinese docs.David Boddie2010-02-081-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | | * | qdoc: Standardized encoding names and updated the Chinese config files.David Boddie2010-02-054-2/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | | * | Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated qdoc's configuration reader so that we can put UTF-8 content in the .qdocconf files later. Reviewed-by: Trust Me
| | | | | | | | * | Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-0315-27/+91
| | | | | | | | |\ \
| | | | | | | | * | | qdoc: Added support for different source and output character encodings.David Boddie2010-02-0210-84/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other documentation, and wrote out XHTML with the same encoding. This change adds additional configuration options (sourceencoding, outputencoding, naturallanguage) that enable translated documentation in non-Latin1 encodings to be built with qdoc. To be reviewed before merge into the master branch. Reviewed-by: Trust Me
| | | | | | | | * | | Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-022-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | | * | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0157-396/+395
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| | | | | * | | | | | | qdoc3: Added curly braces in switch statement for braindead compiler.Martin Smith2010-02-114-11/+26
| | | | | | |_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added the \pagekeywords command. Task: QTBUG-7877
| | | | | * | | | | | qdoc3: Fixed bug in creation of qt.pageindex.Martin Smith2010-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7877
| | | | | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1034-4987/+32
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-1015-23/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7877
generated by cgit v0.12 at 2025-02-02 21:41:21 (GMT)