summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-1833-257/+4648
|\ | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * Fixed a problem with QSvgRenderer::animationDuration().Trond Kjernåsen2009-06-181-0/+1
| | | | | | | | | | | | | | May have returned random values for SVGs without animation tags. Task-number: 256073 Reviewed-by: Kim
| * QNAM HTTP code: Do not close TCP connection in all casesMarkus Goetz2009-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | This makes sure the keep-alive connections stay open even if someone deletes a QNetworkReply which will then go all the way down to removeReply(QHttpNetworkReply). Should fix http://lists.trolltech.com/pipermail/qt-interest/2009-June/007777.html Reviewed-by: Peter Hartmann
| * QItemEditorFactory: made sure the ownership is taken on theThierry Bastian2009-06-182-9/+45
| | | | | | | | | | | | | | | | | | | | QItemEditorCreator The creators were not deleted i nthe destructor of QItemEditorFactory and they could not be safely used for more than one type. Task-number: 228255 Reviewed-by: jasplin
| * Make it possible to drag bookmarks to the root item.kh2009-06-181-1/+2
| | | | | | | | Reviewed-by: kh
| * Cleanup.kh2009-06-182-117/+99
| | | | | | | | Reviewed-by: kh
| * Made QInputDialog::getText() return null QString when rejectedStian Sandvik Thomassen2009-06-182-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | This reverts a behavior change introduced with Qt 4.5.0 where QInputDialog::getText() returned the line edit's text when the dialog was rejected. However, the behavior since Qt 4.0 has been to return a null QString when the dialog is rejected. Task-number: 256299 Reviewed-by: Andy Shaw
| * Add Russian translation for Qt Assistant.Ritt Konstantin2009-06-174-0/+1845
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for QtHelp.Ritt Konstantin2009-06-172-0/+362
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for Qt Linguist.Ritt Konstantin2009-06-172-0/+2003
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian phrase book.Ritt Konstantin2009-06-171-23/+104
| | | | | | | | | | | | | | | | Several uncorrect phrases was re-translated. Added new common used phrases. Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translation for Qt libraries.Ritt Konstantin2009-06-171-1751/+1677
| | | | | | | | | | | | | | | | Added QtWebkit and QXmlPatterns translations. This is an almost complete translation. Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fixed bugs in QPainterPath::united().Samuel Rødal2009-06-172-27/+62
| | | | | | | | | | | | | | | | | | | | Change from a relative to an absolute fuzzy compare as was the case pre-4.4. With a relative fuzzy compare points that have an x or y coordinate of 0 will never be merged with points that are very close to 0, for example (1e-15, 0). Task-number: 251909 Reviewed-by: Trond
| * Fixed segmentation fault caused by empty clip.Samuel Rødal2009-06-173-2/+21
| | | | | | | | | | | | | | | | Make sure not to use the broken QRect constructor, and do an early check on whether the clip rect is empty in QRasterizer::rasterizeLine(). Task-number: 254105 Reviewed-by: Trond
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-06-171-1/+1
| |\
| | * ItemViews : Fixed a performance regression whne changing data in theThierry Bastian2009-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | model This is a part of a bigger patch from 4.6 90cdbf8bd409652fd1e28adcd7f02fc1fae2c1c0 Task-number: 256183 Reviewed-by: ogoffart
| * | BT: Remove Intel CC 10 issue from known issues doc.Jason McDonald2009-06-171-7/+0
| |/ | | | | | | Acked-by: Andy Shaw
| * Fixed a bottleneck in itemviews that would ask for an update outsideThierry Bastian2009-06-171-2/+8
| | | | | | | | | | | | | | | | | | | | of the boundaries of the viewport. Now we catch this and don't call update. This was a performance regression against 4.4. Task-number: 256183 Reviewed-by: alexis
| * add SqlQuery unit test for task: 234422Derick Hawcroft2009-06-161-1/+40
| |
| * revert built-time qm generationOswald Buddenhagen2009-06-166-64/+36
| | | | | | | | | | | | | | | | | | | | | | it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
| * Blank out the Qt-3 area license headers in the qt3to4 resources.Morten Sørvig2009-06-164-0/+0
| | | | | | | | | | | | | | Avoid triggering the license checks in Qt 4. Replace characters between "/*" and "*/" with a space. Reviewed-by: Trust Me
* | Don't initialize data that will be overwritten immediately.hjk2009-06-184-20/+10
| | | | | | | | Reviewed-by: mariusSO
* | Use enum Qt::Uninitialized instead of struct QString::Uninitializedhjk2009-06-183-4/+3
| | | | | | | | | | | | | | There is no BC issue as the changed constructor was introduced recently and there is no released version of Qt using it. Reviewed-by: mariusSO
* | QFontDialog: fixed the current font not being updatedThierry Bastian2009-06-182-11/+26
| | | | | | | | | | | | | | | | This could happen when the list of styles depending on the font is different from the font you selected before. It then is not updated and the style of the font returned by the QFontDialog is wrong. Task-number: 256466
* | Make construction of unitialized QTransform/QMatrix a no-op.Bjørn Erik Nilsen2009-06-186-0/+21
| | | | | | | | | | | | | | | | | | | | These constructors are useful when you have to create a temporary uninitialized QTransform/QMatrix and later initialize it to something else. Done with Lars. Reviewed-by: samuel
* | qdoc: Fixed crash when a compact list section was empty.Martin Smith2009-06-181-24/+27
| |
* | On Mac OS X 10.4, dsable a couple of accessibility tests that hang.Morten Sørvig2009-06-181-6/+12
| | | | | | | | | | Ideally these should be investigated at some point. For now disable them so that the test can be completed.
* | Demo: fixed colors in the calendar when May 1st is a FridayThierry Bastian2009-06-181-14/+14
| | | | | | | | Task-number: 255114
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGeir Vattekar2009-06-1816-22/+187
|\ \
| * | Prevented unnecessary depth clip updates in OpenGL paint engine.Samuel Rødal2009-06-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of whether the depth clip has actually changed between states, so that when QPainter::restore() is called we don't call the potentially expensive updateDepthClip() function when not needed. Task-number: 254658 Reviewed-by: Trond
| * | Added save state detection in OpenGL engine to avoid dirtying state.Samuel Rødal2009-06-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | When setState() is called right after createState() it means that none of the OpenGL state needs changing, so we can simply return. Task-number: 254658 Reviewed-by: Trond
| * | QMenuBar: fixed highlight problem on actions without menuThierry Bastian2009-06-182-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | An item without menu could stay highlighted even when the mouse left the menu bar. Task-number: 256322 Reviewed-by: alexis
| * | Autotests: fix compile issue on hpuxThierry Bastian2009-06-186-8/+12
| | |
| * | Compile on MSVC.Bjørn Erik Nilsen2009-06-182-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The QtSVG module failed to link because it includes qgraphicsitem_p.h, which had an inlined function (updateHelper) that called an undeclared function (QGraphicViewPrivate::update(Region|Rect))...Resulting in unresolved symbols. Reviewed-by: MariusSO
| * | doc: Added explanation of QStringBuilder in QStringMartin Smith2009-06-183-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | The QStringBuilder class documentation is marked \internal. A section has been added to the documentation for QString that explains how to use the reimplemented '%' operator of QStringBuilder to obtain more efficient string concatenation operations.
| * | Fix accidental selection of popup items under the mouse in QComboBoxmae2009-06-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the widget under mouse is hidden, Qt can generate a synthetic mouse move event which gets delivered to the already hidden widget. This can then result in the wrong item being selected. Workaround: in QListView, ignore mouse move events when the widget is hidden. Reviewed-by: Denis
| * | Remove wrong negation.Bjørn Erik Nilsen2009-06-181-1/+1
| | | | | | | | | | | | | | | I changed the logic in e920c83084b48db7fe1925c7b98e34794eec6d55 and this negation incidentally snuck in.
* | | Doc: Added snippet files for state machine overview.Geir Vattekar2009-06-185-0/+294
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Doc: Removed mention of QItemAnimation from animation docs and setGeir Vattekar2009-06-182-6/+1
|/ / | | | | | | | | | | QPropertyAnimation as a main class. Reviewed-by: Trust Me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGeir Vattekar2009-06-183-0/+3
|\ \
| * | Use the unified toolbar on Mac.Morten Sørvig2009-06-183-0/+3
| | |
* | | Doc: Resolved merge conflict in state machine overviewGeir Vattekar2009-06-181-125/+16
|/ / | | | | | | Reviewed-by: Trust Me
* | Fix nasty qt3-qt4 porting trap: for a QStringList, lst.remove(lst.at(idx)) ↵David Faure2009-06-181-2/+2
| | | | | | | | | | | | used to only remove one item in Qt3, while it removes all occurrences of the item in Qt4 (remove==removeAll). To catch it I commented out remove(T) in my qlist.h, which caught this. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fix a couple of issues after QPixmapData optimsAnders Bakken2009-06-184-23/+20
| | | | | | | | | | | | | | | | Make sure we always set w, h and d. See fa8030a935acaacee570eee320e7510a4cfdc853 Reviewed-by: TrustMe
* | Small optimization to QGraphicsScenePrivate::drawSubtreeRecursive.Bjørn Erik Nilsen2009-06-171-1/+5
| | | | | | | | We save three function calls by calling item->paint() directly.
* | Speedup QGraphicsScenePrivate::processDirtyItemsRecursiveBjørn Erik Nilsen2009-06-172-13/+20
| | | | | | | | Avoid QTransform copy in common case.
* | Speedup QGraphicsScenePrivate::processDirtyItemsRecursiveBjørn Erik Nilsen2009-06-171-13/+16
| | | | | | | | Don't calculate dirty scene transforms for invisible items.
* | Sometimes broken transforms in GV.Bjørn Erik Nilsen2009-06-171-4/+4
| | | | | | | | | | | | Broken after: 85f811b849f3b0e0b79e0f1b7bf41512d7f53414 QPainter::worldTransform returns a const reference(!) so we have to make a copy.
* | Reduce QTransform operations in QGraphicsView::paintEvent.Bjørn Erik Nilsen2009-06-171-9/+18
| | | | | | | | | | | | | | The view is usually untransformed, and in that case there's no need to call QGraphicsView::viewportTransform() and QPainter::setWorldTransform(). Reviewed-by: Andreas
* | Remove two work-arounds in QGraphicsView::paintEvent.Bjørn Erik Nilsen2009-06-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The accelerate scrolling work-around is fixed by: 8ebe882b077fffedc3ff80fb80d2e181d5e56ab8 The other case was trying to avoid doing expensive QRegion calculations when everything must be repainted anyways. However, it was not entirely correct to assume all paintEvents are triggered by GV itself. Anyways, we don't need it anymore :-) Reviewed-by: Andreas