summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20782-16228/+102444
|\ | | | | | | | | | | | | 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-1946-253/+1144
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | * Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a missleading function QTextCursor::columnNumber() since 4.2, which almost never returns what you want. The pattern cursor.position() - cursor.block().position() is used frequently in code using QTextCursor. Reviewed-by: Roberto Raggi
| | * Fixed URL in Russian translation.Robert Loehning2010-02-191-1/+1
| | | | | | | | | | | | Reviewed-by: hjk
| | * 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-1842-251/+1115
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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() ...
| | | * optimize qstring::simplified()Oswald Buddenhagen2010-02-182-23/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - avoid detaching if the string is already simplified - avoid calling isSpace() multiple times on the same character Reviewed-by: joao
| | | * Revert optimizations to QString::appendKai Koehne2010-02-182-42/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 03ac778172b783d26bb1c7c5d92bdedd045fcc92 and commit 02135be18f3c4b1d1525aff6dfe96c9c8521084d. They broke qt on all platforms (e.g. qmake didn't compile on Windows any more).
| | | * unbreak QList::append() and co. againOswald Buddenhagen2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure that the detached object is always at least as big as the original one. that may be somewhat wasteful, but it is no worse than before the detach() optimization. one may consider improvements later. Reviewed-by: joao
| | | * Implement bookmark manager widget.kh12010-02-178-52/+606
| | | | | | | | | | | | | | | | Add some more flexible approach to rename, export and import bookmarks.
| | | * optimization: use QList::reserve() and QVector::reserve()Oswald Buddenhagen2010-02-171-1/+3
| | | | | | | | | | | | | | | | Co-authored-by: denis
| | | * amend "purge msvc.net and msvc2002 makespecs"Oswald Buddenhagen2010-02-174-7/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - win32-msvc.net/qplatformdefs.h was included from msvc2003. inline it. - purge references to msvc.net from feature files Reviewed-by: mariusSO
| | | * Added QPlainTextEditor::anchorAt(const QPoint &pos)Thorbjørn Lindeijer2010-02-172-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | The equivalent of QTextEdit::anchorAt. Done-with: mae
| | | * 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/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1717-56/+194
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: 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() optimization: get rid of QString::fromUtf16() usage, part 2 add QString(const QChar *) c'tor
| | | | * avoid double reallocations in appending operationsOswald Buddenhagen2010-02-162-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operator+=() and co. would first detach, and then realloc if they found the reservation too small. in particular, appending anything to an empty list would trigger this double reallocation (first copy shared_null, then grow the copy). Reviewed-by: joao Reviewed-by: denis
| | | | * avoid double reallocation in string-growing replace() caseOswald Buddenhagen2010-02-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detach() followed by resize() is suboptimal, as it first creates an identically sized copy, and then a differently sized one. Reviewed-by: joao Reviewed-by: denis
| | | | * optimize qHash() some moreOswald Buddenhagen2010-02-161-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on modern architectures, a longer data dependency chain is worse than a slightly bigger instruction. as it happens, the code is also clearer. would you have guessed that qHash() is only 28 bits wide? Reviewed-by: joao Reviewed-by: denis
| | | | * optimize QList::mid()Oswald Buddenhagen2010-02-162-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of append()ing each element separately, reserve enough space and do a low-level node copy. obviously, the gain for small simple types is the biggest. Reviewed-by: joao Reviewed-by: denis
| | | | * optimization: use QList::reserve() in QSet::toList()Oswald Buddenhagen2010-02-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Reviewed-by: Joao
| | | | * add QList::reserve()Oswald Buddenhagen2010-02-162-8/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while this reserves memory "only" for the pointer list, this still amounts to 100% of the re-allocs for small simple types. for big/complex/static types the gain is lower, but still. Reviewed-by: Denis Reviewed-by: Joao
| | | | * optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-1610-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly irrelevant when converting internal data structures which are raw utf16 in host byte order. so replace it with QString::fromUnicode() where possible (which seems to be everywhere). the reasoning is the same as in commit e0fda52f, so not getting further reviews. Reviewed-by: denis Reviewed-by: joao
| | | | * add QString(const QChar *) c'torOswald Buddenhagen2010-02-162-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to complement the QString(const QChar *, int) one, which unfortunately clamps sizes below zero to zero instead of computing the length itself instead. Reviewed-by: denis Reviewed-by: joao
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-19305-5704/+5976
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | * | | | Revert "Speed up QmlGraphicsItem::setParentItem."Bjørn Erik Nilsen2010-02-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 282a46ab5edafa7b82e9c58658143cb979db2d85. This change introduced some regression due to itemChange notifications not being delivered as expected (reported by Warwick). We have to find another solution, unfortunately. However, the performance penalty isn't that big so we can live with it for now.
| | * | | | Fix dynamic exampleAlan Alpert2010-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Dynamic property creation appears to have been restricted.
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-193-13/+10
| | |\ \ \ \
| | | * | | | Fix tst_QmlGraphicsLoader::networkRequestUrl autotest.Michael Brasser2010-02-191-2/+2
| | | | | | |
| | | * | | | Fix tst_qmlgraphicstextedit::delegateLoading autotestLeonardo Sobral Cunha2010-02-191-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test case was wrong before, if one sub-component fails, then the whole component fails to load.
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-193-8/+5
| | | |\ \ \ \
| | | * | | | | Delete the QmlImageRequestHandler in the correct thread.Martin Jones2010-02-191-3/+6
| | | | | | | |
| | * | | | | | More strict type checking of ListElement properties.Warwick Allison2010-02-195-14/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6203
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-193-8/+5
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Fix "AnimatedImage ignores Anchors setting"Michael Brasser2010-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8343
| | | * | | | | Remove unused function that breaks build on AIX.Michael Brasser2010-02-191-8/+0
| | | | | | | |
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-19728-3552/+17293
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | 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>
| | * | | | | | docWarwick Allison2010-02-191-2/+5
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-18637-1951/+13820
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1812-416/+435
| | |\ \ \ \ \
| | | * | | | | Make QmlDom API internalKai Koehne2010-02-186-410/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's still used by QmlDesigner, therefore the symbols have to be exported. Task-number: QTBUG-6845
| | | * | | | | Compile fix with namepaceshjk2010-02-184-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8205
| | | * | | | | Doc: reformulate why we build a buttonHenrik Hartz2010-02-181-2/+3
| | | | | | | |
| | | * | | | | Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transitionLeonardo Sobral Cunha2010-02-181-1/+0
| | | | | | | |
generated by cgit v0.12 at 2024-12-30 23:27:29 (GMT)