summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QTreeView: Make sure the state QStyle::State_Sibling is correctly setOlivier Goffart2009-10-272-10/+10
| | | | | | | | That state used not to be set for drawing the content of the items. Also, it could be wrong for branches if there was hidden items. Reviewed-by: Thierry Task-number: related to 234930
* Fixes QTreeView: stylesheet :has-children pseudo selector doesn't works for ↵Olivier Goffart2009-10-272-13/+18
| | | | | | | | | | | the ::item pseudo-class The State_Children was not set on the QStyleOption. Refactorized a little bit the way it was computed. Reviewed-by: Thierry Task-number: 234930 Task-number: QTBUG-3129
* Do not hardecode the ToolBar Icon SizeOlivier Goffart2009-10-273-7/+1
| | | | | | So we correctly get the size from the platform plugin Reviewed-by: jbache
* QTableView would not correctly resize to contentsThierry Bastian2009-10-272-0/+6
| | | | | | | | The problem was that we didn't call ensurePolished when getting the size of the sections. Task-number: QTBUG-1002 Reviewed-by: ogoffart
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-277-32/+41
|\
| * Fixed a bug in QMenuBar in RTL that would display menu at the wrong placeThierry Bastian2009-10-272-17/+16
| | | | | | | | | | | | | | | | This could happen when adding actions in response to the aboutToShow signal. Task-number: QT-2596 Reviewed-by: ogoffart
| * Fixed crash when setting header data in QSqlQueryModel.Gabriel de Dietrich2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash (Q_ASSERT_X failure) happened when a proxy model was being attached to the QSqlQueryModel, and no query was set yet. The headerDataChanged() signal was being received by the proxy model who wouldn't check its "proxyfied" data bounds. The patch introduces a behaviour change. However, this change makes the usage of QSqlQueryModel::setHeaderData() to be more in accordance with the current documentation, and to behave in the same way as for QStandardItemModel, QTreeModel, and QTableModel. Task-number: QTBUG-4963 Reviewed-by: Olivier
| * stabilize test and fix warningOlivier Goffart2009-10-261-0/+2
| |
| * Fixed typoGabriel de Dietrich2009-10-261-1/+1
| | | | | | | | | | | | | | Would not have introduced any bug as invald QModelIndex are currently initialised with -1 for row and column. Reviewed-by: trust me
| * Drag and drop in QListWidget would not preserve the selectionGabriel de Dietrich2009-10-262-13/+21
| | | | | | | | | | | | | | | | | | | | Now, when dropping items, these will remain selected, and in the same visual order as when dragged. Auto-test included for the items moving part. For the rest, it's a drag-and-drop thing. Reviewed-by: Olivier
* | Respect the per-item layoutSpacing() if the style uses that feature.Jan-Arve Sæther2009-10-275-69/+109
| | | | | | | | | | | | | | | | | | | | We move the QLayoutStyleInfo class out of the gridlayout engine to a common header file so that anchor layout also can utilize it. Due to that we now can have a per-item spacing we have to change the 'effectiveSpacing' argument of refreshSizeHints to just take a QLayoutStyleInfo pointer that we will later query for the actual spacing used.
* | If a QGraphicsWidget gets a StyleChange event, invalidate its layout.Jan-Arve Sæther2009-10-271-0/+2
|/ | | | | | | | The layout should be invalidated because all layouts are dependent on some style-specific defaults. (e.g. PM_LayoutHorizontalSpacing can differ.) Reviewed-by: alexis
* Fix buglet in QGraphicsItem::stackBefore().Andreas Aardal Hanssen2009-10-261-1/+1
| | | | | | | | | | | | | | | | | Reported by Alan. The stackBefore() implementation did not alter the insertion order if the two items' current Z values were different. The fix is to ensure it is updated, so that the stackBefore() operation takes effect should the Z values become equal in the future. Example: Current order: A-B-C-D A->setZValue(1); Current order: B-C-D-A (A moves to the end) D->stackBefore(A); Current order: B-C-D-A (unchanged, D is already before A) A->setZValue(0); Current order: D-A-B-C (now A moves back, and D moves in front) Reviewed-by: Aaron Kennedy
* Phonon: allows to stream wave files from QIODeviceThierry Bastian2009-10-231-4/+7
| | | | Reviewed-by: trust Me
* Wrong worldTransform() on the painter in QGraphicsScene::drawForeground.Bjørn Erik Nilsen2009-10-231-0/+8
| | | | | | | | | | | | | | | The painter's worldTransform() is updated for each item we draw, and when the DontSavePainterState optimization flag is set, this change is not protected by save() and restore(). After all the items are drawn, it means the painter is left with the last drawn item's transform. We therefore have to make sure it is reset back to whatever it was before the items were drawn. Auto-test included. Task-number: QTBUG-4973 Reviewed-by: alexis Reviewed-by: andreas
* MAke sure we call setCurrentTime when an animation is startedThierry Bastian2009-10-232-12/+9
| | | | | | This could be prevented by a pause animation currently running. Reviewed-by: Leo
* QGraphicsLineItem leave traces when moving around (reg. against 4.5)Bjørn Erik Nilsen2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | The problem was that QGraphicsLineItem's bounding rect is an empty rect (either width is 0 or height is 0), and when updating the item's old occupied area, we explicitly checked whether the rect was empty() or not. In case of being empty (rect.isEmpty()) we did nothing, which was the root of the problem. We can safely remove the rect.isEmpty() check without any significant loss of performance since the common case is that the rect is non-empty. And in the case of being empty, we'll bail out from QGraphicsViewPrivate::updateRect's highly optimized rect intersection. Auto test included. Task: QTBUG-4877 Reviewed-by: alexis
* Added visual DnD indicator for left to right flow in QListViewGabriel de Dietrich2009-10-234-3/+119
| | | | | | | | | | | | Extended the behaviour already present in QAbstractItemView into QListView. This means some code duplication which should maybe be refactored at some point. (Seems to be the price to pay when some delegate does almost the same thing as the base class). No auto-test, as it's a drag-and-drop related task. Reviewed-by: Thierry Task-number: QTBUG-3730
* Fix crash in QGraphicsView BSP discovered in Amarok.Alexis Menard2009-10-221-6/+8
| | | | | | | | | | | | | Basically some items were not properly remove in the BSP which means that if you delete one of items, the BSP tree may contain dangling pointers. The problem was in removeItemHelper in QGraphicsScene were the child were removed after reparenting to 0 the topmost parent. The sceneBoundingRect for children was invalid which means that we were removing them in the wrong position inside the BSP. Reparenting to 0 means that the sceneBoundingRect will be the boundingRect but wasn't the case before (for the topmost parent). Reviewed-by:bnilsen
* Warning --Alexis Menard2009-10-221-1/+1
| | | | Reviewed-by:TrustMe
* In Vista style, renaming Animation, Transition and PulseThierry Bastian2009-10-222-37/+37
| | | | | | There is a name clash, so we prefixed them with QWindowsVista Reviewed-by: Benjamin Poulain
* Merge branch 'origin/4.6' into widgets-team/4.6Olivier Goffart2009-10-22124-3829/+7950
|\
| * QtScript: Compatibility with 4.5Olivier Goffart2009-10-221-0/+4
| | | | | | | | | | | | | | | | We must register the same type as they were registered in Qt 4.5 Reported on qt4-preview-feedback mailing list. Reviewed-by: Kent Hansen
| * Qt patches to libpng sources.aavit2009-10-221-2/+12
| | | | | | | | | | This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to 1.2.40.
| * Upgrade libpng to version 1.2.40aavit2009-10-2286-3626/+6428
| | | | | | | | | | This commit contains a clean copy of the libpng source distribution. The Qt patches will follow in a separate commit.
| * qfontengine_win.cpp: special Windows CE code removedJoerg Bornemann2009-10-221-75/+16
| | | | | | | | Reviewed-by: thartman
| * Fix a bug in QGraphicsRotation related to 2D projectionsRhys Weatherley2009-10-222-2/+4
| | | | | | | | | | | | | | The projection to 2D needs to be done when the rotation is applied, not after all transformations have been applied. Reviewed-by: trustme
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-2284-30806/+55398
| |\ | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-2222-30144/+54246
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Iain2009-10-2164-30780/+55188
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtMultimediau.def src/s60installs/eabi/QtNetworku.def
| | | * | Update EABI DEF files for Symbian OSIain2009-10-205-10/+55
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-224-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clock() function should return microseconds, fixed example, alsa backend and win32 backend. Reviewed-by:Justin McPherson
| * | | | Properly detect font smoothing setting on Mac OS X in raster engineEskil Abrahamsen Blomfeldt2009-10-213-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would assume font smoothing on the mac was always turned on, giving poor text rendering in the cases where it was not. This implementation mirrors querying the cleartype setting on Windows, checking the setting on application initialization and rendering into an 8 bit cache if it is turned off. Task-number: QTBUG-4881 Reviewed-by: Morten Johan Sørvig
| * | | | Fixed an assert when running the composition demo on Mac.Trond Kjernåsen2009-10-201-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't create a QGLWidget in the QGLEngineSelector, since it may be called before a QApplication object has been constructed. Reviewed-by: Kim
| * | | | Make sure QGLTextureCache exists when creating surfaces for pixmapsTom Cooksey2009-10-202-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLTextureCache installs pixmap cleanup hooks which are used to clean up the EGL surfaces. Reviewed-By: Trustme
| * | | | Add a new window surface which utilises QX11GLPixmapDataTom Cooksey2009-10-205-4/+239
| | | | | | | | | | | | | | | | | | | | | | | | | The new surface uses XCopyArea to post updates to the window and thus, supports partial updates.
| * | | | Fixed the SVG paint engine to preserve whitespace when drawing text.Kim Motoyoshi Kalland2009-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added xml:space="preserve" to the output text tag. This attribute tells the SVG user agent not to strip away excess whitespace in the text element. Reviewed-by: Trond
| * | | | Fixed a stencil clearing bug in the GL 1 engine.Trond Kjernaasen2009-10-201-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system clip changed the stencil buffer wasn't necessarily updated correctly. Use a region to keep track of the dirty areas in the stencil buffer, like we do in the GL 2 engine. Reviewed-by: Samuel
| * | | | Fix build on desktop X11Tom Cooksey2009-10-202-3/+1
| | | | | | | | | | | | | | | | | | | | Hash-Define out X11GL pixmap data until the GLX implementation is ready.
| * | | | Use different GL contexts for ARGB & RGB pixmapsTom Cooksey2009-10-191-31/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 16 bpp systems, RGB pixmaps are 16-bit whereas ARGB pixmaps are 32-bit. This means two different EGL configs are used which are incompatable with each other. As a result, we have to use 2 different EGL contexts - one for each config. Reviewed-By: Trustme
| * | | | Add an assert testing the cleanup hooks exist before executing themTom Cooksey2009-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | Add a new QX11GLPixmapData which renders to X pixmaps using GLTom Cooksey2009-10-199-5/+304
| | | | | | | | | | | | | | | | | | | | | | | | | Enable it by setting QT_USE_X11GL_PIXMAPS environment variable while using the -graphicssystem opengl
| * | | | Separate modification & destruction pixmap cleanup hooksTom Cooksey2009-10-195-19/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the QExplicitlySharedDataPointer change, the ref-count was 0 when calling the cleanup hooks from ~QPixmap. That enabled the hook to figure out if the pixmap is being modified or deleted. As the ref count is now 1 when calling the cleanup hooks in ~QPixmap, we need to seperate the hooks. This change should make using textre-from-pixmap faster as the EGL/glX surface wont get re-created everytime the pixmap is modified. Reviewed-By: Gunnar
| * | | | Stop QEglContext destroying contexts it doesn't ownTom Cooksey2009-10-192-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Rhys Weatherley
| * | | | Integrated new triangulating stroker into QtGunnar Sletta2009-10-195-54/+730
| | | | |
| * | | | Fixed slow QPixmap::fill() when the pixmap is sharing data.Kim Motoyoshi Kalland2009-10-191-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the pixmap is sharing data with other pixmaps, it must be detached before it is filled. Instead of detaching by making a copy, create a new uninitialized data object since all pixels are overwritten by fill() anyway. Task-number: QTBUG-3228 Reviewed-by: Trond
* | | | | Fixed crash in tst_qabstractitemview.Gabriel de Dietrich2009-10-211-3/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trust-me
* | | | | The QMenuPrivate::activationRecursionGuard has to be a boolean.Marius Bugge Monsen2009-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Make QMenu::activateCausedStack() exception safe.Marius Bugge Monsen2009-10-211-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use an internal class to reset the activationRecursionGuard when the scope is closed. Reviewed-by: Leo Cunha
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Marius Bugge Monsen2009-10-2146-30180/+54601
|\ \ \ \ \ | | |_|_|/ | |/| | |