summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-099-638/+829
|\ | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| * Removing semi-colon at the end of namespaceJoão Abecasis2009-11-051-1/+1
| | | | | | | | ... was breaking symbian-abld build.
| * Ensure IDC and UIC3 dependencies are correctMarius Storm-Olsen2009-11-052-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | After the refactoring to src/tools/tools.pro the dependencies for IDC and UIC3 ended up being incorrect, due to the eval rules later in that file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and before ActiveQt, so the dependencies remain correct as before the refactoring. The added condition of src/tools/tools.pro ensures that we add the tools to the Makefile in src/tools, should we decide to generate it, and compile from there. Reviewed-by: Jason McDonald
| * Remove 4k-chunking in QFSFileEngine::read/writeFdFhJoão Abecasis2009-11-041-85/+78
| | | | | | | | | | | | | | | | | | | | | | This was a serious performance issue on Symbian and not necessarily optimal on other platforms. For the time being, we'll allow the OS to read/write as much as it can. Otherwise cleaned up the code, adding checks for invalid len arguments. Task-number: QT-2347 Reviewed-by: Peter Hartmann
| * Extending tst_QFile::writeLargeDataBlock testJoão Abecasis2009-11-041-30/+134
| | | | | | | | | | | | | | | | To test not only native, but fd and FILE* backends as well. Moved expensive generation of large block into a separate function that caches the result. Reviewed-by: Peter Hartmann
| * Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-044-32/+75
| | | | | | | | | | | | | | | | | | Configure.exe would simply initiate a build for each of the tools in order. However, this would break certain distributed build systems, since they would return right away after initiating the make. Thus, sometimes moc et al. would try to link before bootstrap lib was built. Reviewed-by: Jason McDonald
| * QHostInfo: do not wait forever on cleanupPeter Hartmann2009-11-041-2/+4
| | | | | | | | | | | | | | | | | | | | patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting forever for the thread to terminate, which did not always succeed due to a Linux kernel bug. Now, we just wait for some time and then return anyway. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-5296
| * QLocalSocket test: stabilize test by calling waitFor... functionPeter Hartmann2009-11-031-4/+6
| | | | | | | | | | | | ... to make sure bytes are availabe to read Reviewed-by: Aleksandar Sasha Babic
| * QNetworkReply autotests: move performance tests to benchmarksPeter Hartmann2009-11-022-479/+530
| | | | | | | | | | | | | | | | Move the performance tests from tests/auto/qnetworkreply to tests/benchmarks/qnetworkreply, because they belong there and they were crashing from time to time. Reviewed-by: Markus Goetz
* | Default to X11 instead of QWS for commercial buildsPaul Olav Tvete2009-11-091-1/+1
| | | | | | | | | | Reviewed-by: Thiago Reviewed-by: Jason McDonald
* | My changes for 4.6.0Peter Hartmann2009-11-091-0/+29
| |
* | Doc: typo fixedJoerg Bornemann2009-11-092-2/+2
| | | | | | | | Reviewed-by: TrustMe
* | Updated change logPrasanth Ullattil2009-11-091-71/+91
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6jasplin2009-11-092-0/+23
|\ \
| * | More inDestructor checks.Warwick Allison2009-11-091-0/+9
| | | | | | | | | | | | | | | | | | Declarative tripped these (crashes). Reviewed-by:Aaron Kennedy
| * | Crash on bug QTBUG-5493Warwick Allison2009-11-091-0/+14
| | |
* | | My changes.jasplin2009-11-091-0/+12
|/ /
* | Merge commit 'ceteam/4.6' into 4.6Joerg Bornemann2009-11-096-11/+90
|\ \ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| * | changes-4.6.0 updatedJoerg Bornemann2009-11-061-0/+11
| | |
| * | my changes for 4.6.0Joerg Bornemann2009-11-061-1/+4
| | |
| * | fix QWizard issues on Windows CEJoerg Bornemann2009-11-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was reproducable with the example in <QTDIR>\examples\dialogs\trivialwizard You could not push the navigation buttons using the stylus. Task-number: QTBUG-3613 Reviewed-by: thartman
| * | fixes button size for Windows mobile styleJoerg Bornemann2009-11-061-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | The old button sizes were just to big. For example the trivialwizard example had a minimal width that was much too wide for the screen. Task-number: QTBUG-3613 Reviewed-by: thartman
| * | cetest crashes and no helpful debugging providedKeith Isdale2009-11-061-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unguarded use of QList::first() leads to Q_ASSERT() if the list is empty Add support for a "-d" option to project file print parser debugging Do not make use of QMAKESPEC variables in .qmake.cache instead determine the current default if mkspec was not passed to cetest Task-number: QTBUG-5490 Reviewed-by: Lincoln Ramsay Joerg Bornemann
| * | compilefixes for qfeaturesThomas Hartmann2009-11-064-3/+26
| | | | | | | | | | | | Reviewed-by: Maurice
* | | Mistake in the example for QByteArray::lastIndexOf()Keith Isdale2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Correct typing error "azy" -> "az" Ensure that the example code returns indicated values. Task-number: QTBUG-5571 Reviewed-by: Peter Yard
* | | Change file updates for Rhys WeatherleyRhys Weatherley2009-11-091-0/+74
| | |
* | | Changes file update for Sarah Smith 4.6 changes.Sarah Smith2009-11-091-0/+3
| | | | | | | | | | | | | | | | | | Describe 4.6 changes by Sarah Smith Reviewed-by: TrustMe
* | | Merge file://t:/dev/qt-46-wt into widgetteamJan-Arve Sæther2009-11-086-198/+653
|\ \ \
| * | | Use at() instead of operator[] for vectors and lists.Jan-Arve Sæther2009-11-071-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | Using operator[] can cause a deep copy if the container is not const. Some of the containers were const, but I changed all of them to use at() since its more Qt-style.
| * | | Merge branch 'cmarcelo-vertexsimplification' into 4.6Jan-Arve Sæther2009-11-074-184/+632
| |\ \ \
| | * \ \ Merge branch 'anchor-vertex-simplification' of ↵Jan-Arve Sæther2009-11-074-184/+632
| | |\ \ \ | | | | | | | | | | | | | | | | | | git://gitorious.org/~cmarcelo/qt/cmarcelos-clone into cmarcelo-vertexsimplification
| | | * | | QGAL: avoid passing Orientation for interpolation functionsCaio Marcelo de Oliveira Filho2009-11-062-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all of the interpolation functions needed the orientation information, and the one that needs can look at the orientation of the anchor in the parameter. This simplified a little bit the function calls. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | | QGAL: vertex simplificationCaio Marcelo de Oliveira Filho2009-11-062-73/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some vertices are connected by anchors with size 0, which means that in practice, they represent the same point when positioning items, i.e. their distance value is the same. In those cases, we can merge the two anchors in one, that's what vertex simplification do. The algorithm is walking in the graph, merging vertices in pairs (this could be enhanced to allow groups with arbitrary number of children vertices) The vertex simplification stage happens before the anchor simplification, so it'll make less passes. Also, in some situations of redudant anchors it will allow more anchors to be simplified. This commit creates a new type of AnchorVertex, add the algorithm for vertex simplification and restoration, make sure that distribution also works with simplified vertices. Consequences: - the assert after creating a sequence might not be true anymore, it was a structural assumption that vertex simplification may destroy; - we assumed that a center anchor could appear only in the beginning or end of the candidates, because the "center vertex" always would have 3 adjacents. A mix of parallel+center and vertex simplification break that assumption. The commit deal with those consequences. We still have one limitation: vertex simplification needs to restore the graph in every invalidation (which might be caused by some child's updateGeometyry()), since a change in the sizeHint might cause a new anchor to have size 0 or a 0-sized anchor to have a different size. In the future we can track the 0 sized anchors and only restore/re-simplify when the set changes. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | | QGAL (Test): redundant anchors shouldn't harm simplificationCaio Marcelo de Oliveira Filho2009-11-061-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a simple test to check whether redundant anchors avoid simplification to happen. In this case, the use of addCornerAnchors generate redundant anchors. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | | QGAL: allow parallel anchors simplify center anchorsCaio Marcelo de Oliveira Filho2009-11-062-16/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit make possible to parallelize anchors that are center anchors, i.e. that have extra constraints (stored in itemCenterConstraints). This is trivial to support since the parallel anchor will have the same size as its children, so it can just "take the place" of its children in the constraints. Restore function was added as well. To manipulate internal structures, relevant static functions were promoted to methods. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | | QGAL: fix leak when restoring anchorsCaio Marcelo de Oliveira Filho2009-11-061-36/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The restore algorithm had a leak, so we did not delete all the sequences and parallel anchors that were not part of the simplified graph, i.e. that were nested inside other anchors. This commit fix the leak and clean the restore function a little bit, so the recursive function is called even for Normal anchors (which are dealt accordingly). Note that the before/after information is exactly the ->from/->to information available in the anchor being looked on. Also added an assertion to document the fact that at this point (restoring anchor simplification), one of the two anchors inside a parallel anchor must be a sequence. The algorithm depends on that because you can't have two anchors with the same start and end points. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | | QGAL (Test): Enable remaining tests in 'qgraphicsanchorlayout1'Eduardo M. Fleury2009-11-061-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests were still disabled because were not supported somewhere in the past. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | | QGAL (Test): Add test where center anchor is simplified by parallelEduardo M. Fleury2009-11-061-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not handling the case where a parallel anchor is created to simplify a central anchor. Unfortunately no tests had shown that case yet. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | | QGAL: Revamp the edge interpolation codeEduardo M. Fleury2009-11-062-29/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the code of interpolateSequentialAnchor to use the distance values of the sequential anchor itself as base for the children distances. So the 'base' parameter was removed. This also allowed out-of-order parallel anchors to be interpolated, and the 'base' parameter also to be removed from interpolateParallelAnchor. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | * | | QGAL: Support for out-of-order parallel anchorsEduardo M. Fleury2009-11-062-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now parallel anchors account for the fact they may be composed of anchors with different directions. We arbitrarily set the direction of the parallel anchor to be the same direction as the first child. The methods refreshSizeHints and updateChildren were updated to support this situation. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| * | | | | The sizePolicy property of QGraphicsWidget should be of type QSizePolicy of ↵Jan-Arve Sæther2009-11-071-1/+1
| |/ / / / | | | | | | | | | | | | | | | course!
| * | | | Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into ↵Jan-Arve Sæther2009-11-062-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | morpheuz-fixes
| | * | | | Make sizePolicy a property of QGraphicsWidget tooArtur Duque de Souza2009-11-062-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The widget has sizePolicy as a property and declaring that properly helps scripting. Just as it was done with min/pref/max sizes. Signed-off-by: Artur Duque de Souza <artur.souza@openbossa.org>
* | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-06360-3076/+8673
|\ \ \ \ \ \
| * | | | | | Fix a signed/unsigned comparison warningJoão Abecasis2009-11-061-1/+1
| | | | | | |
| * | | | | | Improving reliability and information from the large file testJoão Abecasis2009-11-061-0/+35
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saw a couple of sporadic failures on Windows platforms. Debug output should help find what's happening. Once the fillFileSparsely test fails, there's no point in trying to read what we failed to write so maximum tested size is reset on a failed write. Reviewed-by: Markus Goetz
| * | | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-06214-1659/+4643
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0611-4/+59
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'feature' into 4.6Jørgen Lind2009-11-0611-4/+59
| | | |\ \ \ \ \
| | | | * | | | | Fix QT_NO_GRAPHICSVIEWJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: paul