summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Update IBY file to contain all Qt modules, inc. phonon, multimedia, sqlIain2009-10-141-0/+8
| | | | Reviewed-by: Janne Koskinen
* Cocoa: QInputDialog autotest reveals event dispatcher bugRichard Moe Gustavsen2009-10-141-8/+13
| | | | | | | | | | On Cocoa, we sometimes need to block sending posted events (because we need to flush the event que now and then without touching Qt events). But we forgot to do same for timer callback. So this patch makes sure that we dont send the timer event immidiatly if we are just flushing the event que. Rev-By: brad
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Janne Koskinen2009-10-1412-1741/+3682
|\
| * Update Polish translationsJarek Kobus2009-10-148-1730/+3657
| |
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-141-10/+16
| |\
| | * Fix tst_QSidebar::addUrls() on Symbian.Liang QI2009-10-141-10/+16
| | | | | | | | | | | | | | | | | | On Symbian, QDir::rootPath() and QDir::home() are same. RevBy: Janne Anttila
| * | Rebuilt configure.exe.Miikka Heikkinen2009-10-141-0/+0
| |/ | | | | | | Reviewed-by: Janne Koskinen
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-144-59/+81
| |\
| | * Bump heap and stack size for Phonon plugins.Frans Englich2009-10-141-0/+5
| | | | | | | | | | | | | | | | | | This is required by the Helix plugin. As discussed with Dallas team/Fu Liz. Reviewed-by: Shane Kearns
| * | Synced QT_BUILD_PARTS in .qmake.cache and projects.pro for Symbian.Miikka Heikkinen2009-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects.pro is forcing QT_BUILD_PARTS to omit docs and translations, but configure still outputted those into .qmake.cache. Fixed configure to also omit them for Symbian builds to make building demos work equally whether built by from root or not. Task-number: QT-1018 Reviewed-by: axis
| * | Changed "Qt for S60" -> "Qt for Symbian" in configure.Miikka Heikkinen2009-10-141-1/+1
| | | | | | | | | | | | Reviewed-by: axis
* | | QtWebkit demos&examples compilation fix for SymbianJanne Koskinen2009-10-141-3/+9
| |/ |/| | | | | | | | | | | | | Fix for applications not compiling containing #include<QtWebkit> due to relative inclusion problem in Symbian build environment. Task-number: QTBUG-4846 Reviewed-by: Iain
* | doc: Replaced \obsolete with \warning.Martin Smith2009-10-143-59/+76
|/ | | | | | Warning: This class is provided only to get access to S60 specific functionality in the application framework classes. It is not portable. We strongly recommend against using it in new applications.
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-1414-72/+158
|\
| * Cocoa: qfiledialog will not exit cleanlyRichard Moe Gustavsen2009-10-141-0/+3
| | | | | | | | | | | | | | | | | | The native filedialog will not exit if it is told to hide. To remedy this, we just add an extra interrupt call so to inform the event dispatcher that it needs to return the the event loop to check if it has been told to quit Rev-By: olivier
| * qdoc: Made the \sincelist command produce better html.Martin Smith2009-10-143-66/+105
| |
| * Fix the autotest for S60, skip tst_QPainter::drawClippedEllipse().Liang QI2009-10-141-1/+1
| | | | | | | | RevBy: Janne Anttila
| * Fix the install targets on the new embedded demosTom Cooksey2009-10-148-4/+48
| |
| * Build the embedded demos on X11 so they can be used by MaemoTom Cooksey2009-10-141-1/+1
| |
* | Removed platform specific include from qprocess.hMiikka Heikkinen2009-10-144-11/+13
|/ | | | | | | | It wasn't necessary to have a Symbian specific include in qprocess.h, as 64-bit integer will work as pid also in Symbian. Task-number: QT-2266 Reviewed-by: Janne Anttila
* Remove excess spam from autotests when postgresql creates primary indexes.Bill King2009-10-147-2/+40
|
* Improve scissor clipping in the OpenVG engineRhys Weatherley2009-10-131-0/+4
| | | | | | | | If the scissor is being used to clip instead of the mask, use the bounding rectangle of the clip path if it cannot be handled as a simple rectangle. Reviewed-by: trustme
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-132-4/+12
|\
| * Add further documentation to scratchbox 2 mkspecDonald Carr2009-10-131-3/+5
| | | | | | | | | | | | | | | | Documented that pkg-config functionality must be forced if used in conjunction with this mkspec, and that PKG_CONFIG_PATH is a shell variable not a qmake variable. Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
| * Don't create too many window surfaces in DFBAnders Bakken2009-10-131-1/+5
| | | | | | | | | | | | | | | | Since DirectFB handles the composition for us we don't need to invalidate anything when moving a window. Only on resize do we want another paint event. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Make sure we don't repaint when moving a windowAnders Bakken2009-10-131-0/+2
| | | | | | | | | | | | | | | | We need to make sure the QDirectFBWindowSurface returns true for isBuffered(). Otherwise QWSWindowSurface will force a repaint when moved. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Explicitly request the alpha mask in the EGL configurationRhys Weatherley2009-10-131-0/+4
|/ | | | | | | | The EGL implementation used in S60/NGA for OpenVG does not return a configuration with alpha masking unless it is explicitly requested. Reviewed-by: Julian de Bhal
* Add unsupported mkspec for scratchbox 2 targetsDonald Carr2009-10-132-0/+74
| | | | | | | | | | Scratchbox 2 abstracts away toolchain considerations when cross compiling, allowing us to introduce a generic scratchbox 2 mkspec. See blog for more details: http://labs.trolltech.com/blogs/2009/09/10/cross-compiling-qtx11 Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
* Work around broken ATI X1600 drivers on Mac OS XGunnar Sletta2009-10-131-1/+19
| | | | | | | | | | The GLSL implementation messes up return values from functions so that all our srcPixel()'s become black and several matrices are off. We don't want to rewrite the shader code to fit an "ancient" graphics card, so we simply fall back to the GL 1 engine. Reviewed-by: Trond (cherry picked from commit 33ed3d0bacddce214a43be60eb6481903e753a88)
* Add known issues wiki to docs.Jesper Thomschutz2009-10-131-0/+4
| | | | Reviewed-by: Jason McDonald
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-1354-20992/+20285
|\
| * Modified QSymbianControl::setFocusSafely to set last focused controlGareth Stockwell2009-10-131-1/+2
| | | | | | | | | | | | to zero only if currently focused Reviewed-by: axis
| * Mac: fix autotest for qcolordialogRichard Moe Gustavsen2009-10-131-1/+3
| | | | | | | | Rev-By: olivier
| * crash fix on WinCE without gesture supportMaurice Kalinowski2009-10-131-3/+6
| | | | | | | | | | | | | | | | | | dd9d8693 added some checks causing SetGestureConfig to not be initialized to 0. Thus it gets derefenced and causes crashes on all WinCE applications. Reviewed-by: denis Reviewed-by: ninerider
| * *Completely new* EABI DEF files for Symbian OSIain2009-10-1311-20796/+18739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: - refrozen from scratch without any of the autotest exports (To spell it out: there is no BC between anything built against these DEF files, and anything built with previous versions of the DEF files) - no autotest exports in this set, so no good for autotests - it is very likely that the DEF files will be reworked again before release, meaning that anything built against these ones won't be BC with the 4.6.0 final release (so don't expect your apps built against the beta to work against the final release) - finally added a DEF file for WebKit Reviewed-by: TrustMe Conflicts: src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtScriptu.def src/s60installs/eabi/phononu.def
| * Temporary workaround to get WebKit to pick up DEF file from std locationIain2009-10-131-0/+13
| | | | | | | | | | | | | | Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
| * Mac: small bugfix to the mac gesture implementationRichard Moe Gustavsen2009-10-131-0/+6
| | | | | | | | | | | | | | | | Make sure that we cancel the pan gesture if the user starts to press several fingers on the trackpad, and the gesture has not yet got a chance to start Rev-By: trustme
| * Fixed the QKeyEvent::nativeModifiers() call.axis2009-10-131-1/+1
| | | | | | | | | | | | | | Earlier we returned a copy of the Qt modifiers. This patch fixes the call to return the real native Symbian one. RevBy: Sami Merila