summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-s60-public into ↵Qt Continuous Integration System2010-02-169-58/+69
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled commit 2b60b542a for all platforms. Fixed missing repaints on S60 3.1. Build break fix for QS60Style. QS60Style: Branch indicator in tree view is misplaced Compilation error fix: missing comma in enum list in QS60Style Scroll bar handle/groove ends are squeezed (in nHD resolution) QS60Style draws drop area as a black rect Remove scrollbar context menu from QS60Style Change a name of a variable to be more descriptive
| * \ Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-1643-2831/+1129
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-16386-4218/+2641
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * | | Fixed missing repaints on S60 3.1.axis2010-02-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happened when a paint event came in from Symbian, but the painted area was bigger than the exposed rect being passed in by Symbian. In these cases we would lose updates to the area outside. Fixed by calling Draw() once more if we detect that we painted a larger area to the backing store. It is still a mystery why this worked on 5.0 though... :-P AutoTest: QWidget passed RevBy: Jason Barron Task: QTBUG-8200
| | * | | Build break fix for QS60Style.Sami Merila2010-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very recent change for QS60Style breaks compilation of the style for 3.1. This is due to that style refers to a skin item ID that is not existing on 3.1 environment. Fixed by referring to the skin ID with its internal values. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | * | | QS60Style: Branch indicator in tree view is misplacedSami Merila2010-02-151-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-7258 make itemview margins larger. This broke the treeviews visually, as indicators are not shown in correct places. Now, indocators are placed correctly for treeviews as well. Task-number: QTBUG-7995 Reviewed-by: Alessandro Portale
| | * | | Compilation error fix: missing comma in enum list in QS60StyleSami Merila2010-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-8193 introduced a new enum value into s60style. Unfortunately, the comma after the value didn't make it into the fix itself. Adding the comma to allow compilation of style. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | * | | Scroll bar handle/groove ends are squeezed (in nHD resolution)Sami Merila2010-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style uses non-square area for scrollbar end graphics areas. It then tries to scale the areas to make them look like native graphics (and keeps the width-height ratio), thus squeezing them. Change style so that scrollbar end areas are squares, just like in native graphics they are. Task-number: QTBUG-7996 Reviewed-by: Alessandro Portale
| | * | | QS60Style draws drop area as a black rectSami Merila2010-02-153-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Drag-n-Dropping elements in itemviews QS60Style draws drop area as a black rect. Change this so that native graphics are used instead. This change only affects touch-devices as non-touch 3.x devices do not have the native graphics defined. In 3.x non-touch devices, style still uses QCommonStyle to draw the DropArea. Task-number: QTBUG-8193 Reviewed-by: Alessandro Portale
| | * | | Remove scrollbar context menu from QS60StyleSami Merila2010-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently style does not forbid scrollbar context menu, so by default long pressing over the scrollbar widget shows the context menu. This is not according to 'S60-style', so from now on the stylehint SH_ScrollBar_ContextMenu returns false. Task-number: QTBUG-8194 Reviewed-by: Alessandro Portale
| | * | | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when calculating a button content size, QS60Style has a variable called buttonWidth, which actually is the width of the content, not the button itself. Change this to buttonContentWidth. Reviewed-by: TrustMe
| * | | | Enabled commit 2b60b542a for all platforms.axis2010-02-162-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-5892 RevBy: Trust me
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1649-330/+634
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compile for namespaced qt. Designer: Implement isDirty()-handling using a QUndoStack. doc: A QPlainTextEdit is never a QTextBrowser fix line endings Designer:Fix undo crash caused by special handling of key move. Fix qml test breakage of 12180c397a2007970978033928b4b5b12efad7c6 Assistant: Rebuild search index at most once at start-up. Prepare translations of the declarative module.
| * | | Designer: Fix compile for namespaced qt.ck2010-02-164-8/+8
| | | |
| * | | Designer: Implement isDirty()-handling using a QUndoStack.Friedemann Kleint2010-02-165-40/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Designer-specific handling of isDirty() due to its bug-proneness, use instead an extended QUndoStack.that allows for setting to 'dirty' without commands for some special cases. Task-number: QTBUG-8041
| * | | doc: A QPlainTextEdit is never a QTextBrowserThorbjørn Lindeijer2010-02-161-1/+1
| | | |
| * | | fix line endingsOswald Buddenhagen2010-02-166-120/+120
| | | | | | | | | | | | | | | | get your git settings fixed, windows users!
| * | | Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2010-02-166-90/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove special handling and storing of commands. Customize SetPropertyCommand such that it is able to perform a transformation of the new value., thus, the same (relative) distance can be used on all widgets and the normal command merging mechanism can be used to merge subsequent moves correctly. Task-number: QTBUG-8213
| * | | Fix qml test breakage of 12180c397a2007970978033928b4b5b12efad7c6Friedemann Kleint2010-02-1621-40/+40
| | | | | | | | | | | | | | | | Fix messages in test data.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1512-40/+72
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Rebuild search index at most once at start-up. Prepare translations of the declarative module.
| * | | Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
| | | | | | | | | | | | | | | | Reviewed-by: kh1
| * | | Prepare translations of the declarative module.Friedemann Kleint2010-02-159-37/+38
| | | | | | | | | | | | | | | | | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-13383-4201/+2598
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (85 commits) Add make stub_sis target, and add webkit stub to qt.iby Fix to S60 softkeys when no active Qt window or native widget is shown. doc: Fixed several typos. Doc: remove \preliminary tag from public multimedia classes Fixed the perl download link and description in docs Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again QNAM HTTP: Optimize detectPipeliningSupport() QNAM HTTP: Set channel to IdleState at better place QXmlSchema: fix crash in schema parser We need to export qBadAlloc() on all platforms now really fix the message editor for dark backgrounds Revert "(ODBC) Use wchar_t instead of assuming 2 bytes." Update Symbian DEF files Export a function to get dfb-surface from a pixmap Fix the WebKit build Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. Fixed compilation with QT_NO_WHEELEVENT Fixed usage of QGLPixelBuffer with share widgets on other X11 screens. Fixed drawing QPixmaps on QGLWidgets on different X11 screens. Take into account the solaris-cc-64-stlport mkspec ...
| * | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132676-3479/+321418
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1342-2829/+1122
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Refactor font and zoom handling, reduces clutter in central widget. Some more refactoring. Move the QWebView based help viewer into it's own source files. add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs use variables from the spec instead of hard-coding platform ifdefs move $(DEL_FILE) 2> NUL redirection into .conf file fix host platform conditional purge msvc.net and msvc2002 makespecs. unsupported for a while now. purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. remove weird -tp ce matching line nobody can say anything about remove remainder of mac9 mode remove the most blatant tmake compat paths simplify add qt5 todo
| * | | | Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | | Some more refactoring.kh12010-02-1212-358/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the QTextBrowser based help viewer into it's own source files and introduce a common base clase that currently only contains the statics, but more to come for common stuff. Review: ck
| * | | | Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| | | | |
| * | | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-122-5/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-122-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | littering generic makefile generator code with it is both plain ugly and unnecessary. Reviewed-by: mariusSO
| * | | | fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | | purge msvc.net and msvc2002 makespecs. unsupported for a while now.Oswald Buddenhagen2010-02-124-359/+0
| | | | | | | | | | | | | | | | | | | | Suggested-by: mariusSO
| * | | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-1213-1585/+7
| | | | | | | | | | | | | | | | | | | | Acked-by: mariusSO
generated by cgit v0.12 at 2025-08-17 10:40:36 (GMT)