summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken tst_QGraphicsView::embeddedViews.Bjørn Erik Nilsen2009-06-301-7/+0
| | | | | | | | This test has been broken after 32f32ee3e752a6cc03505ddaa48d2849eaedc2a6, but the test continued to pass because another bug, which is fixed by 6ee3fb750377eeedf161d96fef02c5fa336810e9. The transform should be exactly the same in both cases.
* More re-factoring of QGraphicsSceneIndex.Bjørn Erik Nilsen2009-06-305-103/+89
| | | | | | | | | | Mostly re-factoring of QGraphicsSceneIndexPrivate::recursive_items_helper so it can re-use code from the scene (topLevelItemsInStackingOrder). That also means we'll use the bsp tree in case of NoIndex instead of always looping through the top-levels. This function is now almost identical to QGraphicsScenePrivate::drawSubtreeRecursive, so it might be worth looking into how we can abstract it even more and have one common recursive function.
* Add lacking parenthesis around bitwise AND operator.Bjørn Erik Nilsen2009-06-291-2/+2
| | | | | | This caused a crash in the diagramscene example because "!bits & something" does not have the same meaning as "!(bits & something)", hence item was never removed from the BSP resulting in a stale item pointer.
* Graphics View: BSP tree cleanup.Bjørn Erik Nilsen2009-06-294-18/+22
| | | | | Ensure the BSP resets the QGraphicsItemPrivate::itemDiscovered bit before returning the list of discovered items.
* Fix broken point item lookup in Graphics View.Bjørn Erik Nilsen2009-06-261-3/+14
| | | | Done with Andreas.
* Proper handling of scene rect in QGraphicsScene(Index).Bjørn Erik Nilsen2009-06-2610-61/+52
| | | | Reviewed-by: Andreas
* Re-factor parts of the QGraphicsSceneBspTreeIndex.Bjørn Erik Nilsen2009-06-253-177/+133
| | | | | This patch adds better support for untransformable items and removes some redundant code.
* Compile tst_QGrahicsSceneIndex after be79229eBjørn Erik Nilsen2009-06-251-15/+0
|
* Stabilize tst_QGraphicsView::moveItemWhileScrolling.Bjørn Erik Nilsen2009-06-251-1/+1
|
* Partially revert be79229eBjørn Erik Nilsen2009-06-251-7/+5
| | | | | The change in processPendingUpdates was completely wrong and broke several auto-tests.
* Fix tst_QGraphicsItem::collidesWith_item autotest.Andreas Aardal Hanssen2009-06-231-1/+2
| | | | | | Avoid unwanted recursion by keeping the sceneRect variable locally. The recursion happens if the call to sceneRect() lazily emits the sceneRectChanged() signal.
* Ensure that the BSP index returns all untransformable items.Andreas Aardal Hanssen2009-06-231-0/+2
|
* Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-06-23196-1413/+10828
|\ | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsscene_p.h
| * Fix option rect offset for QComboBox on Vista styleJens Bache-Wiig2009-06-231-2/+3
| | | | | | | | | | Task-number: 254805 Reviewed-by: prasanth
| * QHttpNetworkReply autotest: fix build on WindowsPeter Hartmann2009-06-231-1/+1
| | | | | | | | | | | | | | build was failing because of a wrong include path set, and the test requires zlib Reviewed-by: Jesper Thomschütz
| * Fixed build error on X11 with gcc 4.1.2.jasplin2009-06-231-6/+6
| | | | | | | | | | | | | | | | gcc 4.1.2 on X11 somehow confuses assignment of a temporarily constructed QSettings object to a reference with invalid access to the private assignment operator of QSettings. Reviewed-by: mgoetz
| * Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-2352-92/+1002
| |\ | | | | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | * Fix compilation after the last change.Thiago Macieira2009-06-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The #include <phonon> header no longer exists. And the <Phonon> or <Phonon/Phonon> headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. Reviewed-By: Marius Storm-Olsen
| | * Attempt to fix header installation for Phonon.Thiago Macieira2009-06-232-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the long-standing issue of whether Phonon headers should be written with a capital P or a lowercase one. KDE releases of Phonon had <Phonon/CapitalClassName> whereas Qt 4.4 had <phonon/filename.h>. I tried to solve this before by adding a Phonon subdir next to phonon in include/, but that only compounded the error: the presence of two dirs caused problems and the installation wasn't fixed. So instead try to place Phonon/ClassName inside include/phonon. And fix the installation to do it properly: just copy the include/$lib dir into the target, then overwrite the .h files with the sources from src/$lib. Reviewed-by: Marius Storm-Olsen
| | * mark plural messages as such in the qm readerOswald Buddenhagen2009-06-231-0/+18
| | | | | | | | | | | | | | | | | | this contains both a "clean" code path based on translation count and a fallback path based on looking for "%n" (for languages with only one form).
| | * add -input-codec option for qm readerOswald Buddenhagen2009-06-232-3/+10
| | | | | | | | | | | | | | | basing the input codec on the locale was broken by design and didn't really work anyway. so adding this option really is a bugfix, kind of.
| | * Fix the dash pattern examples in the documentation of QPenBenjamin Poulain2009-06-231-2/+2
| | | | | | | | | | | | | | | The custom dash pattern must have an even number of entries. Our examples were using an odd number.
| | * Fix missing member initialization.kh2009-06-2315-1/+16
| | | | | | | | | | | | Reviewed-by: ossi
| | * Doc - Adding the new Frozen Column Example by Pierre Rossi into our list ofKavindra Devi Palaraja2009-06-232-0/+2
| | | | | | | | | | | | | | | | | | examples Reviewed-By: TrustMe
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-06-231-5/+0
| | |\
| | | * Improve text drawing quality with CarbonSimon Hausmann2009-06-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable fractional coordinates for text output, to produce the same output as regular Carbon/ATSUI applications. Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | * | Doc - Adding Pierre Rossi's frozen column exampleKavindra Devi Palaraja2009-06-2310-0/+758
| | |/ | | | | | | | | | Reviewed-By: TrustMe
| | * make the last checkin compile.Bill King2009-06-231-2/+0
| | |
| | * Fixes non-unicode strings should be strings, not bytearrays.Bill King2009-06-231-17/+1
| | | | | | | | | | | | | | | | | | Passes all autotests. Task-number: 251739
| | * Prevented QWizard from crashing upon removing a page after deleting a field ↵jasplin2009-06-223-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object. QWizard crashed when removing a page after deleting an object that was already registered as a field for the page. This patch prevents such a crash by doing the necessary cleanup immediately when the object is deleted. QWizard::removePage() will then see a consistent state in this case. Reviewed-by: janarve Task-number: 255350
| | * Fixed drawTiledPixmap() for the GL paint engine.Trond Kjernåsen2009-06-221-7/+13
| | | | | | | | | | | | | | | | | | | | | The offset was completely ignored for the GL 1 paint engine. Task-number: 256608 Reviewed-by: Samuel
| | * Check for null pointer in QGraphicsProxyWidget::event() in case there is no ↵Marius Bugge Monsen2009-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | focusWidget(). Reviewed-by: Thierry Task-number: 255468
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Marius Bugge Monsen2009-06-222-1/+32
| | |\
| | | * Moving a child widget right after show() does not work as expected.Bjørn Erik Nilsen2009-06-222-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we did an accelerated move, i.e. scrolled the widget's contents in the backing store and repainted the old area. We cannot do this trick when the widget has been invalidated (show(), resize()). In this case the widget had never been painted, so we basically scrolled the content of its parent and the widget itself appeared as invisible. Auto-test included. Task-number: 255117 Reviewed-by: Paul
| | * | Check if the row larger or equal to the flowPositions vector to prevent out ↵Marius Bugge Monsen2009-06-221-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | of bounds access. This problem is encountered if a model doesn't report it's changes correctly. Reviewed-by: Thierry Task-number: 256617
| | * Fixed wrong painting when doing IntersectClip after setClipping(false).Samuel Rødal2009-06-224-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation is a bit ambiguous on what the expected behavior here is, but the behavior was consistent across paint engines before 4.5. QPaintEngineEx introduced inconsistencies in the raster and OpenGL paint engines, so this patch reverts the behavior back to what it was in 4.4. Task-number: 256549 Reviewed-by: Trond
| | * Fix crash in widget box when using load mode "LoadCustomWidgetsOnly"Eskil Abrahamsen Blomfeldt2009-06-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading the widget box with load mode "LoadCustomWidgetsOnly", it will create an empty category. This will indirectly cause a resize event to be posted for the tree widget of the widget box, which in turn will cause adjustSubListSize() to be called for each category item in the tree widget. Since the category has not yet been populated, the assumption in adjustSubListSize() that cat_item->child(0) is non-null would cause a crash. The fix is to return immediately if the category is empty. Reviewed-by: Friedemann Kleint
| | * task 226042Derick Hawcroft2009-06-221-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | Until the PostgreSQL API has this functionality. Use a hack to find out if a transaction has failed or not. This hack is a limited to 8.x versions of PostgreSQL. Bill King
| | * Minor optimizationAnders Bakken2009-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | No need to set the pen in begin. It's always done before it's used anyway. Reviewed-by: TrustMe
| | * Bail out on invalid color in fillRectAnders Bakken2009-06-221-1/+6
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Use const ref for foreachAnders Bakken2009-06-221-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | doc: Fixed typos.Martin Smith2009-06-231-2/+2
| | | | | | | | | | | | Task-number: 256711
| * | QDockWidget: size incorrect when moving separator on fixed-size dock.Thierry Bastian2009-06-234-61/+58
| | |
| * | Remove default error stateEskil Abrahamsen Blomfeldt2009-06-234-103/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | Having an implicit default error state in the graph which the user has not added is unintuitive and ugly. Rather than have a default error state, we stop execution of the machine and print an error message when the machine has run-time errors. If a user wishes to prevent errors from stopping the machine, you can set one or more error states explicitly.
| * | Improve flushing performance in the raster window surface on Mac.Morten Sørvig2009-06-231-2/+6
| | | | | | | | | | | | | | | | | | Use the display color space for QNativeImage to avoid format conversions. Reviewed-by: Samuel
| * | Fix tests on WindowsEskil Abrahamsen Blomfeldt2009-06-231-16/+16
| | | | | | | | | | | | | | | | | | Formatting of pointers in sprintf() is platform dependent. Use QString::sprintf() instead to make sure warnings match the actual warnings emitted.
| * | Cleanup of db test cases.Bill King2009-06-239-105/+62
| | | | | | | | | | | | | | | Mostly cleanup of dropping of tables to a consistent place. Also enable itemmodel tests.
| * | Mark tests as XFail until they can be investigated further.Bill King2009-06-231-7/+13
| | |
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-2267-545/+7822
| | | | | | | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
| * | QDockWidget: removed separator for not resizable dock widgetThierry Bastian2009-06-224-52/+61
| | | | | | | | | | | | Task-number: 212058
generated by cgit v0.12 at 2025-08-13 06:17:29 (GMT)