summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2061-3211/+878
|\ | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1918-168/+730
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits) Add convenience function QTextCursor::positionInBlock() Fixed URL in Russian translation. Designer/Resourceview: Suppress warning about QFileInfo on empty path. optimize qstring::simplified() Revert optimizations to QString::append unbreak QList::append() and co. again Implement bookmark manager widget. optimization: use QList::reserve() and QVector::reserve() amend "purge msvc.net and msvc2002 makespecs" Added QPlainTextEditor::anchorAt(const QPoint &pos) Fix memmory leak. Fix spacing. Prevent renaming the bookmarks menu root item, it's just a placeholder. Fix broken set last shown pagen when the last page was about:blank. Move launch with external app in base class. Make sure the bookmarks menu updates on add/ remove as well. Fix broken Drag&Drop, reset and clear the model if we set new bookmarks. avoid double reallocations in appending operations avoid double reallocation in string-growing replace() case optimize qHash() some more ...
| | * Designer/Resourceview: Suppress warning about QFileInfo on empty path.Friedemann Kleint2010-02-191-0/+2
| | |
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1817-168/+728
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) optimize qstring::simplified() Revert optimizations to QString::append unbreak QList::append() and co. again Implement bookmark manager widget. optimization: use QList::reserve() and QVector::reserve() amend "purge msvc.net and msvc2002 makespecs" Added QPlainTextEditor::anchorAt(const QPoint &pos) Fix memmory leak. Fix spacing. Prevent renaming the bookmarks menu root item, it's just a placeholder. Fix broken set last shown pagen when the last page was about:blank. Move launch with external app in base class. Make sure the bookmarks menu updates on add/ remove as well. Fix broken Drag&Drop, reset and clear the model if we set new bookmarks. avoid double reallocations in appending operations avoid double reallocation in string-growing replace() case optimize qHash() some more optimize QList::mid() optimization: use QList::reserve() in QSet::toList() add QList::reserve() ...
| | | * Implement bookmark manager widget.kh12010-02-178-52/+606
| | | | | | | | | | | | | | | | Add some more flexible approach to rename, export and import bookmarks.
| | | * Fix memmory leak.kh12010-02-171-0/+1
| | | |
| | | * Fix spacing.kh12010-02-171-0/+3
| | | |
| | | * Prevent renaming the bookmarks menu root item, it's just a placeholder.kh12010-02-172-4/+17
| | | | | | | | | | | | | | | | Reviewed-by: ck
| | | * Fix broken set last shown pagen when the last page was about:blank.kh12010-02-171-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: ck
| | | * Move launch with external app in base class.kh12010-02-176-103/+82
| | | | | | | | | | | | | | | | Reviewed-by: ck
| | | * Make sure the bookmarks menu updates on add/ remove as well.kh12010-02-171-4/+6
| | | | | | | | | | | | | | | | Reviewed-by: ck
| | | * Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.kh12010-02-171-3/+10
| | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | 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
| * | | | | Reduced the memory footprint of qttrace files.Samuel Rødal2010-02-181-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of improvements have been made: * Use single precision floats for the traces. * Reduce the number of variant wrapped transforms by introducing a new translate command. * Reduce the number of bytes streamed per image / pixmap draw command. * Add versioning info to qttrace files to be more future proof. Reviewed-by: Gunnar Sletta
| * | | | | Added --range and --single arguments to qttracereplay.Samuel Rødal2010-02-181-9/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it easy to split a large trace into several sub-traces by running the qttracereplay with -graphicssystem trace. Reviewed-by: Gunnar Sletta
| * | | | | Fix no-webkit compiler helpviewerRhys Weatherley2010-02-174-10/+16
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | QT_NO_WEBKIT is not defined until qglobal.h has been included. Reviewed-by: Daniel Pope
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2013-128/+873
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-195-0/+279
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed off-by-one blending errors in the NEON drawhelper code. Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations.
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-195-0/+279
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations.
| | | * | | | | Cetest extensions for Windows Mobile device power operations.ninerider2010-02-193-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options to reset (-reset) and change the power mode (-wake) of the device were added. The reset is needed to put the device in a defined state after an error has occurred. The unattended power mode ensures that the reset can be effected and that the device will not go to sleep. Reviewed by: Joerg
| | | * | | | | Remote lib extensions for Windows Mobile device power operations.ninerider2010-02-192-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function to change the power mode and to reset the device were added. The reset is needed to put the device in a defined state after an error has occurred. The unattended power mode ensures that the reset can be effected and that the device will not go to sleep. Reviewed by: Joerg
| * | | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-192-0/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
| * | | | | | | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-192-0/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
| * | | | | | | Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-192-225/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. It breaks non-Symbian platforms.
| * | | | | | | Revert "Factored epocRoot implementation out of qmake"axis2010-02-192-297/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. It breaks non-Symbian platforms.
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-198-128/+594
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
| | * | | | | | Modified configure to detect SDK support for Symbian audio backendGareth Stockwell2010-02-181-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version of configure.exe was compiled with MSVC 9.0. Reviewed-by: Miikka Heikkinen
| | * | | | | | Added implementation of epocRoot() function to configureGareth Stockwell2010-02-183-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposing epocRoot() to the configure application allows it to determine the location of the currently active Symbian SDK, so that support for optional SDK features can be checked. Reviewed-by: Miikka Heikkinen
| | * | | | | | Removed duplicated implementation of readRegistryKeys from configureGareth Stockwell2010-02-183-125/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure now shares - at the source level - a single implementation of this function with qmake. Reviewed-by: Miikka Heikkinen
| | * | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-182-0/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
| | * | | | | | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-182-0/+225
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
* | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1910-52/+35
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1811-176/+151
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Help system: Remove hard-coded qt namespace. Help system: Handle all Clucene exceptions.
generated by cgit v0.12 at 2025-01-02 16:55:18 (GMT)