summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rendering artifacts when hiding a QGraphicsItem.Bjørn Erik Nilsen2009-07-092-0/+21
| | | | | | | | | | The problem was that update() followed by hide() didn't work as expected because the update() caused all sub-sequent update requests to be discareded. This is correct, however, we have to make sure the ignoreVisible/ignoreOpacity bit is set properly; we won't process a hidden item otherwise. Auto-test included.
* Optimize QGraphicsViewPrivate::updateRect/updateRegion.Bjørn Erik Nilsen2009-07-083-7/+138
| | | | | | | | | We can do QRect::intersects/contains/operator| faster than QRect because we can assume the rects are normalized. Another important factor is our knowledge about the viewport rect, which is always QRect(0, 0, viewport->width(), viewport->height()). Auto-tests included.
* Reduce QTransform operations in QGraphicsSceneIndex.Bjørn Erik Nilsen2009-07-082-28/+76
| | | | | | | Update the scene transform and use it directly in the same fashion as we do in processDirtyItemsRecursive/drawSubtreeRecursive. All auto-tests pass
* Reduce QTransform operations in Graphics View.Bjørn Erik Nilsen2009-07-084-61/+188
| | | | | | | | | | | Use the item's cached scene transform directly instead of always making a copy of it. Moreover, we don't have to use the transform at all if the scene transform is a "translate only" transform :-). QTransform already use the same cut-offs, but it must update the type() before it can find out. We don't have to check the type() because that is already stored (and we usually don't call type() when we store the value either). All auto-tests pass.
* Simplify QGraphicsScenePrivate::processDirtyItemsRecursive.Bjørn Erik Nilsen2009-07-032-62/+81
| | | | | | This version is easier to read and is slightly faster than the old one. All auto-tests pass.
* More re-factoring of QGraphicsSceneIndex.Bjørn Erik Nilsen2009-07-0210-96/+98
| | | | | | | | | | New method: QGraphicsSceneIndex::estimateTopLevelItems. QGraphicsSceneIndex::estimateItems returns *all* items within the rect, but we are only interested in the top-levels (those that are within the rect themselves or have descendants within the rect) when doing recursive drawing/item-lookup. All auto-tests pass. Demos/examples/manualtests run fine.
* Speedup item-lookup in Graphics View.Bjørn Erik Nilsen2009-07-027-52/+65
| | | | | | | | | We don't have to do a stable sort anymore because the lessThan operator now accounts for the insertion order. This also means we don't have to sort all top-level items to preserve the insertion order in QGraphicsScenePrivate::topLevelItemsInStackingOrder. Reviewed-by: Andreas
* Kill dead BSP tree code in graphics view.Bjørn Erik Nilsen2009-07-022-44/+0
|
* Dont include untransformable graphics items twice.Bjørn Erik Nilsen2009-07-022-1/+39
| | | | | | | | | | This revertes d39a62720ba67a0fa6e4e37519d22f14c7b7404e (we had to do it with the old implementation, but the new one have untransformable items included in the indexed list. The only difference is that untransformable items are also in the untransformable list; otherwise in the bsp tree). Auto-test included.
* Fixes broken BSP lookup in QGraphicsSceneBspTreeIndex.Bjørn Erik Nilsen2009-07-013-6/+27
| | | | | | | | | | | The chip demo was unbelievable slow, so I investigated and found out the bsp always returned almost all items in the tree (40 000 in this particular case). It did so because the tree was initialized with an empty sceneRect. The sceneRect was empty due to a lacking signal-slot connection, resulting in QGraphicsSceneBspTreeIndex::updateSceneRect never being invoked. Auto-test included.
* Fix a regression with extended style option items.Alexis Menard2009-07-012-4/+8
| | | | | | | | | We basically passed an unitialized transform to construct the styleoptions for items that use the useExtendedStyleOption flag. We had an auto-test to cover that but for some reason view.show() was removed by me so the auto-test did nothing. oops. Reviewed-by:bnilsen
* Compiler warning.Bjørn Erik Nilsen2009-07-011-1/+1
|
* Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-07-01152-6080/+2671
|\
| * Compiler warnings.Bjørn Erik Nilsen2009-07-014-2/+5
| |
| * doc: Changed wording in some stub callbacks.Martin Smith2009-07-011-26/+26
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtNorwegian Rock Cat2009-07-01145-6045/+2570
| |\
| | * Make the macros QT_WA & QT_WA_INLINE only use the unicode partMarius Storm-Olsen2009-07-011-10/+2
| | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * examples: QString::fromUtf16() -> QString::fromWCharArray()Marius Storm-Olsen2009-07-011-1/+1
| | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * tests: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-0120-257/+133
| | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * qmake: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportMarius Storm-Olsen2009-07-013-49/+13
| | | | | | | | | | | | | | | | | | | | | Also, QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-019-189/+78
| | | | | | | | | | | | | | | | | | | | | Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/3rdparty/phonon: Remove QT_WA and non-Unicode code paths, dropping Win9x ↵miniak2009-07-011-4/+1
| | | | | | | | | | | | | | | | | | | | | and NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/tools/idc: Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵miniak2009-07-011-53/+16
| | | | | | | | | | | | | | | | | | | | | NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/testlib: LPCWSTR -> wchar_t*Marius Storm-Olsen2009-07-011-1/+1
| | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/qt3support: Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵miniak2009-07-018-724/+231
| | | | | | | | | | | | | | | | | | | | | NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/activeqt: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-0112-266/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | support Also, buffer sizes passed to Registry APIs were incorrect. Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/sql: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-012-37/+2
| | | | | | | | | | | | | | | | | | | | | Also remove many #ifdef UNICODE blocks Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/opengl: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-011-8/+4
| | | | | | | | | | | | | | | | | | | | | support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/network: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-017-104/+43
| | | | | | | | | | | | | | | | | | | | | support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-0150-2919/+1227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also - Make winPeekMessage() & winPostMessage() obsolete - FlashWindowEx, IsValidLanguageGroup functions no longer resolved dynamically (available on >= Windows 2000) - LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system icons/cursors - qsystemtrayicon_win: use Shell_NotifyIconGetRect if available (Windows 7) Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * Handle application paths larger than MAX_PATH, and fix potential buffer overflowMarius Storm-Olsen2009-07-012-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These days we can easily get very long paths, so we should support application paths as long as needed. There was also a potention exploit in that if the path was MAX_PATH or larger, the string would not be \0 terminated (see MSDN docs for GetModuleFileName), and thus cause problems in QString::fromWCharArray(). Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/corelib: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-0128-1340/+554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support Also: QString::fromUtf16() -> QString::fromWCharArray() WCHAR & TCHAR -> wchar_t LPTSTR/LPCTSTR -> LPWSTR/LPCWSTR Documentation update Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * src/winmain: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-011-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support Also TCHAR -> wchar_t LPTSTR/LPCTSTRs -> LPWSTR/LPCWSTRs Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * doc: Fixed several qdoc error reports.Martin Smith2009-07-013-67/+78
| | | | | | | | | | | | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
| * | Never discard TabletRelease events as they may be delivered *after* ↵Cédric Luthi2009-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | TabletLeaveProximity events Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| * | Fix tablet eventsCédric Luthi2009-07-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tablet events should set the qt_button_down, otherwise if the tablet moves onto a widget that does not accept a tablet event, it will set qt_button_down and effectively "grab" the mouse. However, we should only do this if we accept the tablet event. Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| * | Fix a few typosCédric Luthi2009-07-011-5/+5
| |/ | | | | | | | | Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| * Added QGraphicsScene::sendEvent().J-P Nurmi2009-07-013-1/+58
| | | | | | | | | | Merge-request: 787 Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
* | Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-07-011784-149358/+211953
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsscene_p.h src/gui/graphicsview/qgraphicsview.cpp src/gui/graphicsview/qgraphicsview_p.h
| * ItemViews: Fixed signal entered not being emitted when using the mouseThierry Bastian2009-07-013-33/+61
| | | | | | | | | | | | | | | | | | | | wheel The solution is to check the the current "entered item" hasn't change also when the scrollbars change values Task-number: 200665 Reviewed-by: janarve
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-07-011-1/+9
| |\
| | * Fixes configure.exe silently disabling cetest even if you asked for itRohan McGovern2009-07-011-1/+9
| | | | | | | | | | | | | | | | | | when paths to the ActiveSync headers/libraries are not set up. Reviewed-by: Michael Goddard
| * | OpenVG compile fix - use const_cast instead of static_castRhys Weatherley2009-07-011-4/+4
| |/ | | | | | | Reviewed-by: trustme
| * Set the focus to a child widget when set on a QGroupBoxBenjamin Poulain2009-06-302-3/+13
| | | | | | | | | | | | | | | | | | When the focus is set on a QGroupBox with the policy NoFocus, the focus should be propagated to one of the child if it accepts the focus. This was failing because QWidget::focusWidget() returns the QGroupBox itself. Task-number: 257158 Reviewed-by: Denis
| * add 4.6 specific modifications to linguist tools testsOswald Buddenhagen2009-06-307-2/+123
| |
| * Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-30206-14/+6610
| |\
| | * integrate linguist tool autotests into the qt testsuiteOswald Buddenhagen2009-06-30200-0/+6573
| | | | | | | | | | | | Task-number: 218935
| | * Fix Toolbars in unified toolbar looking bad Carbon w/Fullscreen changesNorwegian Rock Cat2009-06-301-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in the Carbon code when an item went in full-screen, than out with a unified toolbar. In those cases the toolbars would end up getting but into the mainwindow area. The reason this was happening was that we were calling transferChildren() after we had set up our toolbar. This cause problems because we end up pulling the QToolbars right out of the unified toolbar. The easiest way to solve this is to just update the status on it again. This should solve any issues. I also added some logic to avoid calling this too many times in that one case. Luckily, this seems to only affect Carbon. Task-number: 254462 Reviewed-by: Jens Bache-Wiig
| | * Doc: Said which formats we support for a QIODevice driven MediaSourceGeir Vattekar2009-06-301-1/+6
| | | | | | | | | | | | | | | Task-number: 253902 Reviewed-by: Thierry Bastian
| | * Doc: Fixed a doc bug in QPlainTextEdit class description.Geir Vattekar2009-06-301-7/+7
| | | | | | | | | | | | | | | Task-number: 256762 Reviewed-by: TrustMe