summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QTreeView: Make sure the state QStyle::State_Sibling is correctly setOlivier Goffart2009-10-273-14/+21
| | | | | | | | 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-273-16/+50
| | | | | | | | | | | 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-273-5/+12
| | | | | | | | 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-2712-48/+150
|\
| * Stabilize sequential animation startDelay autotest on winLeonardo Sobral Cunha2009-10-271-8/+5
| | | | | | | | Reviewed-by: thierry
| * Fixed a bug in QMenuBar in RTL that would display menu at the wrong placeThierry Bastian2009-10-273-18/+44
| | | | | | | | | | | | | | | | 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-262-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-3/+5
| |
| * 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-263-13/+80
| | | | | | | | | | | | | | | | | | | | 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-276-69/+271
| | | | | | | | | | | | | | | | | | | | 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-262-29/+29
| | | | | | | | | | | | | | | | | 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-232-0/+57
| | | | | | | | | | | | | | | 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
* Increase realiability of pauseanimation autotests on winLeonardo Sobral Cunha2009-10-231-20/+24
| | | | Reviewed-by: thierry
* MAke sure we call setCurrentTime when an animation is startedThierry Bastian2009-10-233-12/+18
| | | | | | 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-232-1/+35
| | | | | | | | | | | | | | | | | | 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-222-6/+66
| | | | | | | | | | | | | 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
* Autotest fix for parallel animation groupThierry Bastian2009-10-221-11/+6
| | | | | On macos (as on symbian), we need to leave some time for the application to become responsive.
* stabilize QListView testOlivier Goffart2009-10-221-3/+6
|
* 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-22147-3860/+8128
|\
| * QtScript: Compatibility with 4.5Olivier Goffart2009-10-222-0/+28
| | | | | | | | | | | | | | | | 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.
| * qfiledialog2 added to tests/auto/auto.proJoerg Bornemann2009-10-221-0/+1
| | | | | | | | Reviewed-by: alexis
| * qfontengine_win.cpp: special Windows CE code removedJoerg Bornemann2009-10-221-75/+16
| | | | | | | | Reviewed-by: thartman
| * consider message id when comparing messagesOswald Buddenhagen2009-10-222-2/+12
| |
| * id-based: do not drop unfinished untranslated messagesOswald Buddenhagen2009-10-221-1/+1
| | | | | | | | otherwise the fallback to use the source string is rather pointless
| * id-based: use source strings instead of empty translations only for ↵Oswald Buddenhagen2009-10-222-3/+5
| | | | | | | | unfinished messages
| * actually guess the target language from the file nameOswald Buddenhagen2009-10-221-0/+2
| | | | | | | | --help says it does, but it didn't really.
| * QDom autotests: make test fail instead of time outPeter Hartmann2009-10-221-0/+1
| | | | | | | | | | | | introduce a QFAIL for now until problem is fixed Reviewed-by: Carlos Duclos
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Friedemann Kleint2009-10-2241-138/+1581
| |\
| | * Fix a bug in QGraphicsRotation related to 2D projectionsRhys Weatherley2009-10-223-3/+5
| | | | | | | | | | | | | | | | | | | | | 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-22136-31352/+57141
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-2236-30168/+54717
| | | |\
| | | | * Merge branch '4.5' into 4.6Thiago Macieira2009-10-213-3/+86
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_mac.mm tests/benchmarks/benchmarks.pro tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp
| | | | | * tst_qsslsocket: new bigChunk testcaseMarkus Goetz2009-10-201-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new test is to find out if the BIO size of OpenSSL is limited or not. The test passes on my Linux, however the OpenSSL docu suggests that the BIO size is limited. From http://www.openssl.org/docs/crypto/BIO_s_bio.html "This is currently 17K". Reviewed-by: Peter Hartmann
| | | | | * make missing Key_Back and Key_Forward menu glyphs return 0 on mac(cocoa)Dean Dettman2009-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an addition to commit 5651d2547261ccecbf50f8141c634f59c0adc00d to make it obvious that in cocoa nothing is returned. Task-number: QTBUG-4873 Reviewed-by: MortenS
| | | | | * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5Dean Dettman2009-10-2014-159/+166
| | | | | |\
| | | | | | * Add a up/down benchmark to benchmarks/qnetworkreplyMarkus Goetz2009-10-201-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | | | | | * Backport benchmarks/qnetworkreply to 4.5Markus Goetz2009-10-203-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | | * | Adds Key_Back and Key_Forward menu glyphs on mac(carbon)Dean Dettman2009-10-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change improves the behavior of QMenu when Key_Back and Key_Forward are used as shortcuts. A dotted arrow appears on carbon, and on Cocoa the image is blank, instead of undefined as it was before. Task-number: QTBUG-4873 Reviewed-by: msorvig
| | | | * | | Rename the .cpp for QNetworkReply benchmark testsThiago Macieira2009-10-212-1/+1
| | | | | | |
| | | * | | | Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-226-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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