summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* changes-4.6.0 updatedJoerg Bornemann2009-10-201-0/+6
|
* Doc update for QDir::rootPath and QDir::homePath in Symbian.Janne Anttila2009-10-201-2/+3
| | | | | Task-number: QTBUG-4867 Reviewed-by: Aleksandar Sasha Babic
* i18n: Complete German translations for 4.6.0 (XmlPatterns)Friedemann Kleint2009-10-201-317/+326
|
* Revert "Change the way we handle KeyboardUIMode on Mac"Benjamin Poulain2009-10-202-17/+7
| | | | | | This will be handled differently (QTBUG-4751) This reverts commit b12fb5861ce09539c04cd51db12a9bfbe32a4774.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Alexis Menard2009-10-2020-453/+1089
|\
| * add the autotest for the QListView::setModelColumn bugPierre Rossi2009-10-191-0/+24
| | | | | | | | sha1 of the fix: 2633931653757decd93dd3939c09f5e07203da1c
| * Fix a bug affecting keyboard navigation in the table viewOrgad Shaneh2009-10-191-2/+2
| | | | | | | | | | Reviewed-by: thierry Reviewed-by: pierre
| * Do not loop forever if we are adding the layout itself to the layout.Jan-Arve Sæther2009-10-194-0/+30
| | | | | | | | Reviewed-by: alexis
| * Whitespace cleanup.Jan-Arve Sæther2009-10-191-13/+13
| |
| * API addition: Make it possible to set the size policy of an anchor.Jan-Arve Sæther2009-10-165-68/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this commit, when you modify the spacing of an anchor you are effectively modifying the preferred size of the anchor, since all anchors (except internal ones) have their minimumSizeHint to 0 and maximumSizeHint to QWIDGETSIZE_MAX. I also changed the sizeHintsFromItem to be more generic so that I could use it for anchors. (Thus, it was renamed to "internalSizeHints"). It now only takes care of setting the min/pref/exp/maxSize of AnchorData based on the anchor/item size hint and their size policies. As a consequence of all of this, setFixedSize changed behaviour and became setPreferredSize (since setSpacing is basically setPreferredSize). The implementation of that now only sets the prefSize. The patch also has an unrelated fix for IgnoreFlag, where it will (again) return the minimumSize for sizeHint(Qt::PreferredSize) instead of the maximumSize. This was to be more consistent with qgridlayoutengine.cpp. The docs are not very clear on this behaviour unfortunately. This API change has been discussed. Reviewed-by: alexis
| * Merge branch 'fixes' of ↵Jan-Arve Sæther2009-10-163-181/+464
| |\ | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into 4.6 Conflicts: src/gui/graphicsview/qgraphicsanchorlayout_p.cpp src/gui/graphicsview/qgraphicsanchorlayout_p.h tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
| | * QGraphicsAnchorLayout: Adding two benchmarks on LinearLayout vs AnchorLayout ↵Jesus Sanchez-Palencia2009-10-151-1/+126
| | | | | | | | | | | | | | | | | | | | | cases Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * QGAL: Add anchor layout vs nested linear layouts benchmarkEduardo M. Fleury2009-10-151-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a benchmark to compare the use of three nested linear layouts versus the use of a single anchor layout. We also test two different anchor layout setups to achieve the same visual result. In the first one we use the addCornerAnchors API that, in the way it was used, adds reduntant anchors. The second uses the basic addAnchor API to create only the essential anchors. Currently the first setup is way slower than the second. That happens because the redundant anchors create "zero-sized knots" in the graph, that are not eaten by the simplification algorithm, thus requiring the usage of the simplex solver. Zero-sized knots are groups of three or more vertices that are linked together by zero-sized anchors. In pratice, these vertices represent the same place in the graph (remember, the distance between them is zero), but to the simplification mechanism, they look like three distinct ones. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * QGraphicsAnchorLayout: Mark expected failures in tests w/o simplificationEduardo M. Fleury2009-10-151-24/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests are expected to fail when run without simplification, ie. by setting the environment var QT_ANCHORLAYOUT_NO_SIMPLIFICATION. This commit adds QEXPECT_FAIL before those tests. In some cases the failures are random therefore we must disable the test instead. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * QGAL: refactor and document the simplification algorithmCaio Marcelo de Oliveira Filho2009-10-151-159/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the simplifyGraphIteration() function. The aim was to make it more clear without changing too much the way it does stuff. Before it collected a list of candidates and then filtered that into sublists of same order, and after that removed the center edges from the borders. It also reversed the list if the direction wasn't forward, to pass it in forward order to simplifySequentialChunk() helper function. The refactored version - take in account the order when building the candidates, this avoids index manipulation; - try to calculate 'beforeSequence' and 'afterSequence' as it builds the candidates list; - make simplifySequentialChunk() aware of directions, now it deals internally with reversed direction sequences. This commits also adds explanations to trickier parts of the code. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * QGAL: refactor calculateGraphs() methodCaio Marcelo de Oliveira Filho2009-10-152-75/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create calculateTrunk() and calculateNonTrunk() methods, that calculate sizes for anchors in different parts of the simplified graph (using simplex when needed). Also fixes a minor leak when the nontrunk part is non-feasible. The old code left the loop leaving the contents of 'sizeHintConstraints' not allocated. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * QGAL: update the sizes of all anchors instead of doing it separatedlyCaio Marcelo de Oliveira Filho2009-10-153-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After calculations, update the size of all anchors in the simplified graph. Those updates were happening locally after each calculation (trunk and semifloats), however some anchors that were not involved in simplex calculation were missing. One concrete consequence of the previous behaviour is that semifloat parts that were simplified into just one anchor, didn't have the chance to set their sizeAt* values. One consequence of the new behaviour is one more test passing. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * QGAL: avoid having to re-calculate lists of variablesCaio Marcelo de Oliveira Filho2009-10-152-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the functions solvePreferred() and solveExpanding() to take a list of variables, so they don't need to calculate them based on the list of constraints. That way, the trunk variables are calculated only once. This commit also reduce the scope of 'sizeHintConstraints' variable instead of clearing and reusing it. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * QGAL: add a way to test whether simplex was used in a calculationCaio Marcelo de Oliveira Filho2009-10-153-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one good way to track whether simplification is doing all its job or not. However it can only track cases where the graph simplify to only one anchor. For more complex cases the graph dumps are the way to go. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * QGAL: improve dump graph and add helper codeCaio Marcelo de Oliveira Filho2009-10-152-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | The graph dumper function take a name, and added debug code (that need to be enabled manually) to generate dumps from the graph before and after calculation. This is useful to debug simplification. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * QGraphicsAnchorLayout: Fix sequential anchor distribution w/ expanding sizesEduardo M. Fleury2009-10-151-86/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the addition of expanding SizePolicy, the distribution of sequential anchors became wrong. We must now account for three intervals of distribution instead of only two. This commit also unifies the logic used by the sequential group anchor and the edge interpolator. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * QGraphicsAnchorLayout: Add test for 'infinite' max size widgetsEduardo M. Fleury2009-10-151-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With four items anchored side by side, each of them being allowed to grow to QWIDGETSIZE_MAX, we have a situation of fair distribution because the layout itself can grow only to QWIDGETSIZE_MAX (and not four times this amount). This test identified an error on the expanding distribution logic. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * QGraphicsAnchorLayout: Ensure spacing is not negativeEduardo M. Fleury2009-10-152-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we do not support negative-sized anchors in the graph, instead we invert such anchors and make their value positive. We consider changing this sometime in the future but until then, spacing must be non-negative at all times. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-164-7/+68
| |\ \
| | * | Fixed typo in qtableview.cpp.Gabriel de Dietrich2009-10-162-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | Auto-test included. Will timeout on fail. Reviewed-by: Alexis
| | * | Fixed a rare crash in qt_x11_enforce_cursorGabriel de Dietrich2009-10-152-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A QPointer was set to point to a QWidget by one of its children, during its deletion. This happens during the child deletion, and after the call to QObject::clearGuards(), which means that the QPointer becomes a dangling one. The fix ensures that qt_x11_enforce_cursor will not be called with a being-deleted QWidget. The included auto-test doesn't test anything, except that it doesn't crash. Reviewed-by: Olivier
| * | | Make sure that the anchor layout autotests pass in release configurationJan-Arve Sæther2009-10-162-2/+2
| |/ / | | | | | | | | | | | | | | | | | | The problem was that lastCalculationUsedSimplex was only compiled in debug mode. The autotests run in release, so it did not compile. Reviewed-by: alexis
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-15152-28378/+35584
| |\ \
| | * | Compilation of the QGraphicsAnchorLayout test on 64bitOlivier Goffart2009-10-152-2/+3
| | | | | | | | | | | | | | | | + stabilize the linear layout test
| | * | Fixed updating problems QListView with IconModeGabriel de Dietrich2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The updated rectangle coordinates didn't use the viewport offsets. Reviewed-by: Olivier Task-number: QTBUG-4819
| | * | Stabilize test on x11Olivier Goffart2009-10-152-7/+8
| | | |
| | * | Stabilize QLineEdit test on X11Olivier Goffart2009-10-151-10/+14
| | | |
| | * | Spreadsheet demo: fix the footer color.Olivier Goffart2009-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the footer cell lost his gray color in commit 7c12258485db8d Task-number: QTBUG-4821 Reviewed-by: Jan-Arve
| * | | Merge branch 'fixes' of ↵Jan-Arve Sæther2009-10-155-184/+353
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes Conflicts: src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
| | * | | QGAL: refactor calculateGraphs() methodCaio Marcelo de Oliveira Filho2009-10-092-75/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create calculateTrunk() and calculateNonTrunk() methods, that calculate sizes for anchors in different parts of the simplified graph (using simplex when needed). Also fixes a minor leak when the nontrunk part is non-feasible. The old code left the loop leaving the contents of 'sizeHintConstraints' not allocated. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * | | QGAL: update the sizes of all anchors instead of doing it separatedlyCaio Marcelo de Oliveira Filho2009-10-093-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After calculations, update the size of all anchors in the simplified graph. Those updates were happening locally after each calculation (trunk and semifloats), however some anchors that were not involved in simplex calculation were missing. One concrete consequence of the previous behaviour is that semifloat parts that were simplified into just one anchor, didn't have the chance to set their sizeAt* values. One consequence of the new behaviour is one more test passing. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * | | QGAL: avoid having to re-calculate lists of variablesCaio Marcelo de Oliveira Filho2009-10-092-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the functions solvePreferred() and solveExpanding() to take a list of variables, so they don't need to calculate them based on the list of constraints. That way, the trunk variables are calculated only once. This commit also reduce the scope of 'sizeHintConstraints' variable instead of clearing and reusing it. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * | | QGAL: add a way to test whether simplex was used in a calculationCaio Marcelo de Oliveira Filho2009-10-093-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one good way to track whether simplification is doing all its job or not. However it can only track cases where the graph simplify to only one anchor. For more complex cases the graph dumps are the way to go. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * | | QGAL: improve dump graph and add helper codeCaio Marcelo de Oliveira Filho2009-10-092-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The graph dumper function take a name, and added debug code (that need to be enabled manually) to generate dumps from the graph before and after calculation. This is useful to debug simplification. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * | | QGraphicsAnchorLayout: Fix sequential anchor distribution w/ expanding sizesEduardo M. Fleury2009-10-091-86/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the addition of expanding SizePolicy, the distribution of sequential anchors became wrong. We must now account for three intervals of distribution instead of only two. This commit also unifies the logic used by the sequential group anchor and the edge interpolator. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * | | QGraphicsAnchorLayout: Add test for 'infinite' max size widgetsEduardo M. Fleury2009-10-091-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With four items anchored side by side, each of them being allowed to grow to QWIDGETSIZE_MAX, we have a situation of fair distribution because the layout itself can grow only to QWIDGETSIZE_MAX (and not four times this amount). This test identified an error on the expanding distribution logic. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * | | QGraphicsAnchorLayout: Ensure spacing is not negativeEduardo M. Fleury2009-10-092-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we do not support negative-sized anchors in the graph, instead we invert such anchors and make their value positive. We consider changing this sometime in the future but until then, spacing must be non-negative at all times. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
* | | | | Merge branch 'mmfphonon' into 4.6Frans Englich2009-10-203-3/+8
|\ \ \ \ \
| * | | | | Does not disable full screen when end of video playlist is reached.Frans Englich2009-10-192-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on Symbian and Windows(DS9). Task-number: QTBUG-4869 Reviewed-by: Gareth Stockwell
| * | | | | Kill warning, simplify code.Frans Englich2009-10-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-201-2/+13
|\ \ \ \ \ \
| * | | | | | Cocoa: modal window reappears on screen after reactivating appRichard Moe Gustavsen2009-10-201-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you close a modal window, then activate different app, then activate app again, the window will pop non-modal in front. This patch makes sure that when we hide a window, we point to the next window to receive keyboard focus. Rev-By: MortenS
* | | | | | | The shipped pvr2d.h/wsegl.h for PowerVR do not work with MBXRhys Weatherley2009-10-201-3/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-201-3/+0
|\ \ \ \ \ \
| * | | | | | Fix now invalid ExpectFail.Bill King2009-10-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug causing this fail is now fixed, so remove the expectfails.
generated by cgit v0.12 at 2025-08-26 08:00:03 (GMT)