summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QTreeView: Fix premature pessimizationJoão Abecasis2010-02-181-4/+5
| | | | Reviewed-by: Olivier Goffart
* Simplify code, fix a compiler warning... profit!João Abecasis2010-02-181-7/+5
| | | | | | | Well, it was a compiler warning on master... :-/ Reviewed-by: Janne Anttila Reviewed-by: axis
* tst_qnetworkreply: Add another testcaseMarkus Goetz2010-02-181-0/+66
| | | | Reviewed-by: Peter Hartmann
* QNAM HTTP: Clean code a bitMarkus Goetz2010-02-182-29/+45
| | | | | | .. and some changes that will help us track down bugs Reviewed-by: Peter Hartmann
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-188-34/+35
|\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
| * QNAM HTTP: Always set channel.reply to 0 when doneMarkus Goetz2010-02-185-22/+27
| | | | | | | | | | | | | | This will help us to track down a sporadic bug that made requests being sent again even if they were already done. Reviewed-by: Peter Hartmann
| * Revert "Added note to make QList destructor virtual in version 5"Zeno Albisser2010-02-181-1/+1
| | | | | | | | | | | | | | Virtual functions should not be used with copyable types due to slicing. This reverts commit c1db6c2c5a3bbe96a628207af169a032d535426f.
| * Fix s390(x) atomic ops related crashesDirk Mueller2010-02-171-10/+6
| | | | | | | | | | | | | | | | | | | | The s390 implementation of the pointer related atomic ops never worked before, and the memory barrier was mixed up between the Acquire and the Relaxed variant. This fixes both. Merge-request: 2312 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Fix undefined sequence point compiler warningDirk Mueller2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | level = ++level is not guaranteed to work, as the increment is not required to happen before the assignment. Change this code to be less obscure and use standard defined behavior. Merge-request: 471 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-188-15/+44
|\ \ | |/ |/| | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use correct include path for qglobal.h Fixed softkey localizaton to comile also on platforms without softkeys. Use correct (forward slash) separators in qmake-generated bld.inf Support for dynamic localization in Symbian softkeys.
| * Use correct include path for qglobal.hIain2010-02-181-1/+1
| | | | | | | | Reviewed-by: Shane Kearns
| * Fixed softkey localizaton to comile also on platforms without softkeys.Janne Anttila2010-02-181-0/+2
| | | | | | | | | | Task-number: QTBUG-6785 Reviewed-by: TrustMe
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-187-14/+41
| |\ |/ / | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use correct (forward slash) separators in qmake-generated bld.inf Support for dynamic localization in Symbian softkeys.
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-177-14/+41
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use correct (forward slash) separators in qmake-generated bld.inf Support for dynamic localization in Symbian softkeys.
| | * Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We should always use forward slash as a directory separator in include paths - it's not OS dependant. Task-number: QTBUG-8308 Reviewed-by: Alessandro Portale
| | * Support for dynamic localization in Symbian softkeys.Janne Anttila2010-02-176-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for dynamic i.e. runtime localization of S60 softkeys. Note that translations are not provided yet with qt.sis (QTBUG-4919), meaning that localization does not actually happen unless application developer provides its own translation (including translation for softkeys). Task-number: QTBUG-6785 Reviewed-by: Jason Barron
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-175-4/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation on Mac 32-bit. Doc fix, ensure that the \obsolete tag is placed correctly Added note to make QList destructor virtual in version 5 Fix handling of Evaluation licenses on the Windows configure.exe
| * | Fix compilation on Mac 32-bit.Thiago Macieira2010-02-171-1/+1
| | | | | | | | | | | | Reviewed-By: Trust Me
| * | Doc fix, ensure that the \obsolete tag is placed correctlyAndy Shaw2010-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | If its not placed in the right place then it will cause the doc to lose the line that \obsolete is on Reviewed-by: TrustMe
| * | Added note to make QList destructor virtual in version 5Zeno Albisser2010-02-171-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fix handling of Evaluation licenses on the Windows configure.exeThiago Macieira2010-02-172-1/+2
| | | | | | | | | | | | Reviewed-By: Marius Storm-Olsen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-171-19/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Remove unusable test case from QGraphicsItem benchmark. Remove unstable test case from QGraphicsItem::setTransform benchmark. Stabilize QGraphicsItem benchmarks.
| * | Remove unusable test case from QGraphicsItem benchmark.Bjørn Erik Nilsen2010-02-171-12/+0
| | | | | | | | | | | | setRotation() is already covered by the rotate() test case.
| * | Remove unstable test case from QGraphicsItem::setTransform benchmark.Bjørn Erik Nilsen2010-02-171-1/+0
| | | | | | | | | | | | | | | | | | The item's transform is identity by default, so trying to set an indentiy transform again does too little in order to measure it with stable results.
| * | Stabilize QGraphicsItem benchmarks.Bjørn Erik Nilsen2010-02-171-7/+23
| | | | | | | | | | | | | | | | | | The benchmark must report stable numbers in order to be useful. E.g. we can not accept instability of +-20% between each run (with the same configuration in the same environment).
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-17139-302/+336
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Change all ptrdiff_t to qptrdiff. HTTP backend: remove comment Fixed failure of maketestselftest with vcproj generator. Fixed compile of compilerwarnings test with vcproj generator. Fixed compile of qlibrary test with vcproj generator. Fixed compile of xmlpatterns tests with vcproj generator. Fixed compile of shm/sem tests with vcproj generator. Fixed compile of QtHelp tests with vcproj generator. Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace Fixed compile of these tests when Qt is configured with -qtnamespace Check in sample license headers
| * | | Change all ptrdiff_t to qptrdiff.Thiago Macieira2010-02-179-23/+22
| | | | | | | | | | | | | | | | Reviewed-By: Bradley T. Hughes
| * | | HTTP backend: remove commentPeter Hartmann2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the date header always needs to be updated in the cache. Task-number: QTBUG-7466
| * | | Fixed failure of maketestselftest with vcproj generator.Rohan McGovern2010-02-171-1/+3
| | | |
| * | | Fixed compile of compilerwarnings test with vcproj generator.Rohan McGovern2010-02-173-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Rename the test C++ file from `test.cpp' to `test_cpp.txt'. When named `test.cpp', the build system will attempt to build it, which we don't want.
| * | | Fixed compile of qlibrary test with vcproj generator.Rohan McGovern2010-02-171-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | COPY and DESTDIR_TARGET are defined by qmake when generating makefiles, but not when generating vcproj files. We need to do something different for the vcproj generator.
| * | | Fixed compile of xmlpatterns tests with vcproj generator.Rohan McGovern2010-02-1775-114/+73
| | | | | | | | | | | | | | | | | | | | These tests were adding the same SUBDIR multiple times from different projects. Don't do that.
| * | | Fixed compile of shm/sem tests with vcproj generator.Rohan McGovern2010-02-1731-46/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SUBDIRS+=../path/to/lackey from two different places means that qmake sees the lackey project twice. This breaks the vcproj generator. Make it so that lackey is only referred to once.
| * | | Fixed compile of QtHelp tests with vcproj generator.Rohan McGovern2010-02-1710-109/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests were doing: SUBDIRS+=../../../tools/assistant/lib ... to ensure that part of Qt was built before building the test. That's a cute hack, but it's a bad idea: it breaks the vcproj generator to process the same subdir multiple times, and it also gives the very unintuitive result that doing `make clean' under tests/auto cleans out a part of the Qt build!
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1712-3/+127
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace Fixed compile of these tests when Qt is configured with -qtnamespace Check in sample license headers
| | * | Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespaceRohan McGovern2010-02-164-0/+12
| | | |
| | * | Fixed compile of these tests when Qt is configured with -qtnamespaceRohan McGovern2010-02-165-3/+12
| | | |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-02-169-46/+135
| | |\ \
| | * | | Check in sample license headersJason McDonald2010-02-163-0/+103
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-171-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-171-2/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-161-2/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
| | | * | | Fix broken image loading on windows.kh12010-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the url is valid and we could find the file in the compressed help, otherwise pass on an error message. We might have got garbage in the first patch, so the isEmpty() check was not sufficient. Do not integrate in master, since it was fixed already there. Task-number: QTBUG-8082, QTBUG-8248 Reviewed-by: ck
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-171-14/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed autotest failure in tst_QGraphicsScene::render on Maemo.
| * | | | | Fixed autotest failure in tst_QGraphicsScene::render on Maemo.Samuel Rødal2010-02-171-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixed point code in the raster paint engine's drawEllipse() function causes rendering errors on ARM. Remove untested code and use the vector path fallback instead. Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-175-348/+452
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed function names in audio input example to clarify meaning Tidied up debug output in audio input example Removed redundant strings from audio input example Cleaned up memory management in audio input example Changed variable names in audio input example to match Qt code style Made level calculation in audio input example work for all formats Removed unused variable from audio input example Update suspend/resume button label in audio input example Changed function names in audio output example to clarify meaning Cleaned up implementation of audio output example Tidied up debug output in audio output example Removed redundant strings from audio output example Cleaned up memory management in audio output example Changed variable names in audio output example to match Qt code style Made data generation in audio output example work for all formats Update suspend/resume button label in audio output example Added missing override in audio output example Only use unix-like tools when not building for Symbian in Windows.
| * | | | | Merge branch 'audio-examples' into 4.6Gareth Stockwell2010-02-164-339/+443
| |\ \ \ \ \
| | * | | | | Changed function names in audio input example to clarify meaningGareth Stockwell2010-02-162-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Tidied up debug output in audio input exampleGareth Stockwell2010-02-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Removed redundant strings from audio input exampleGareth Stockwell2010-02-162-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
generated by cgit v0.12 at 2025-01-22 09:49:50 (GMT)