summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-07-2114-1533/+2
|\ | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Revert "Add the chart utility from qtestlib-tools." Remove references to files removed by previous commit. Remove files as instructed by Legal department.
| * Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-2014-1533/+2
| |\ |/ / | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tools/qtestlib/chart/database.cpp tools/qtestlib/chart/database.h tools/qtestlib/chart/reportgenerator.cpp tools/qtestlib/chart/reportgenerator.h
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2014-1517/+2
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Add the chart utility from qtestlib-tools."
| | * Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-2014-1517/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 453abe70fec02456aba2219025f5202060eaece1. Task-number: QT-3583 Reviewed-by: Jason McDonald
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-197-96/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove references to files removed by previous commit. Remove files as instructed by Legal department.
| | * Remove references to files removed by previous commit.Jason McDonald2010-07-192-8/+0
| | |
| | * Remove files as instructed by Legal department.Jason McDonald2010-07-196-88/+0
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-203-27/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed some translations doc: Fixed typos in QAbstractFileEngineIterator Updated changelog for 4.7.
| * | | Removed some translationsRobert Loehning2010-07-201-24/+0
| | | | | | | | | | | | | | | | Reviewed-by: Daniel Molkentin
| * | | doc: Fixed typos in QAbstractFileEngineIteratorRobert Loehning2010-07-201-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale
| * | | Updated changelog for 4.7.Yoann Lopes2010-07-201-0/+5
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-202-9/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added missing deployment to autotest. Fixed some deployment issues on Symbian. Fixed a QSplashScreen hanging bug in S60 3.1 devices.
| * | | | Added missing deployment to autotest.axis2010-07-201-1/+4
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| * | | | Fixed some deployment issues on Symbian.axis2010-07-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both plugins should be part of the main package now. RevBy: Trust me
| * | | | Fixed a QSplashScreen hanging bug in S60 3.1 devices.axis2010-07-201-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSymbianBitmapDataAccess is used to provide access to the bitmap heap in a manner that locks correctly on all platform versions. The heapWasLocked variable was meant to protect against the case where the heap is locked recursively. However, it failed to take into account the case where the same QSymbianBitmapDataAccess object was used to lock recursively. In this case the variable would be changed to true on the second lock, which means that the lock would never be released again. This was fixed by making the access reference counted instead. Since the bitmap heap lock is global, the refcount was made global as well. Task: QTBUG-11129 RevBy: Jason Barron AutoTest: Works again. It was hanging before this fix.
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-205-8/+102
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.7.0 changes Fix a Headerview layout bug Qt does not build with qt_namespace on macos Add a testcase for when peeking and then reading from a QIODevice
| * | | My 4.7.0 changesEskil Abrahamsen Blomfeldt2010-07-201-5/+52
| | | | | | | | | | | | | | | | My 4.7.0 changes
| * | | Fix a Headerview layout bugPierre Rossi2010-07-202-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the sections were moved calling logicalIndex on what was already a logical index messed up the hidden sections. Task-number: QTBUG-12268 Reviewed-by: Gabriel
| * | | Qt does not build with qt_namespace on macosCarlos Manuel Duclos Vergara2010-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the QT_BEGIN_NAMESPACE was in the wrong place. I moved it 10 lines before and the problem is gone. Task-number: QTBUG-12262 Reviewed-by: Prasanth
| * | | Add a testcase for when peeking and then reading from a QIODeviceAndy Shaw2010-07-201-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This case was broken and then fixed again recently, this testcase should ensure that it does not break again in the future. Reviewed-by: Andreas Kling
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-207-96/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove some files as instructed by Legal department.
| * | | Remove some files as instructed by Legal department.Jason McDonald2010-07-207-96/+0
| | | | | | | | | | | | | | | | Task-number: QT-3613
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1911-10/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Check in the correct configure.exe Examples: Fix compilation with namespace. Rebuilt configure.exe Make configure.exe accept -no-gif again, fix comment
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1911-10/+14
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Check in the correct configure.exe Examples: Fix compilation with namespace. Rebuilt configure.exe Make configure.exe accept -no-gif again, fix comment
| * | | Check in the correct configure.exeDaniel Molkentin2010-07-191-0/+0
| | | | | | | | | | | | | | | | Reviewed-By: Alessandro Portale
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1911-10/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Examples: Fix compilation with namespace. Rebuilt configure.exe Make configure.exe accept -no-gif again, fix comment
| | * | | Examples: Fix compilation with namespace.ck2010-07-198-8/+10
| | | | |
| | * | | Rebuilt configure.exeDaniel Molkentin2010-07-191-0/+0
| | | | |
| | * | | Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-192-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Jason McDonald
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-194-776/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Extend the detection of CPU feature for x86 Remove some more unneeded files from libjpeg, avoiding GPL
| * | | | Extend the detection of CPU feature for x86Benjamin Poulain2010-07-192-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add detection of CPU extension for SSE3, SSSE3, SSE4.1, SSE4.2 and AVX. Reviewed-by: Andreas Kling
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-07-1952-793/+490
| |\ \ \ \
| * | | | | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3584 Reviewed-by: Trustme
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-191-1/+18
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Do image comparison with fuzz
| * | | | Do image comparison with fuzzHarald Fernengel2010-07-191-1/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like native png and jpeg libs on some devices have rounding problems, so compare the color values with a fuzz of 3. This fixes this test on Maemo 5 and 6. Reviewed-by: Benjamin Poulain
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1932-714/+395
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Convert examples and demos to use Bearer Management. Fixes deployment rules for embedded qml demos application. Fix build on Symbian.
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1932-714/+395
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Convert examples and demos to use Bearer Management. Fixes deployment rules for embedded qml demos application. Fix build on Symbian.
| | * | | Convert examples and demos to use Bearer Management.Aaron McCarthy2010-07-1924-711/+388
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10439
| | * | | Fixes deployment rules for embedded qml demos application.Aaron McCarthy2010-07-197-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deployment rules for the qml resources in the embedded qml demo applications were not being generated correctly as data_caging_paths was not being loaded.
| | * | | Fix build on Symbian.Aaron McCarthy2010-07-191-3/+0
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1919-78/+77
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix ListView sections with QList<QObject*> Doc error fixes. Remove the -use-blur option from qtdemo Add label to explain how to exit QML demos PathView doc clarification. Fix Samegame
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-195-59/+32
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-195-12/+27
| | |\ \ \ \
| | * | | | | Remove the -use-blur option from qtdemoAlan Alpert2010-07-195-56/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It relied on the now missing pixmap property. Since it isn't used, it doesn't seem worth the effort to update it to use a declarative image provider instead.
| | * | | | | Add label to explain how to exit QML demosAlan Alpert2010-07-191-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some people didn't figure it out intuitively, so extra help is now provided. Task-number: QTBUG-11868
| * | | | | | Fix ListView sections with QList<QObject*>Martin Jones2010-07-194-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeVisualDataModel::stringValue() did not handle QList<QObject*> model types. Task-number: QTBUG-12005
| * | | | | | Doc error fixes.Martin Jones2010-07-194-4/+4
| | |/ / / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1912-27/+50
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-1924-27/+185
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1913-2/+137
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105 Always place PathView delegates centered on the path Add a PathView example.
generated by cgit v0.12 at 2025-09-07 22:17:43 (GMT)