summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
| * 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.
* \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-181-5/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2 Used aligned load and store when possible for the blending of ARGB32
| * | | | Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2Andreas Kling2010-07-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The unaligned prologue was processed without using the const alpha. Regressed with 9427b4c8f3b5.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-181-5/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Used aligned load and store when possible for the blending of ARGB32
| | * | | | Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-171-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unaligned load and store can be costly. This patch mitigate the problem by aligning the destination before using SSE2. The destination is aligned because it is used by load and store, while the source is only use by load. On Atom, the blending test is 7% faster for ARGB32. Re-pushing that patch, thanks to awesome policies... Reviewed-by: Andreas Kling
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1810-20/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove qMemCopy() usage from all .cpp files of Qt itself.
| * | | | | Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-1810-20/+20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is (supposedly) more efficient as the compiler can optimise it to a builtin, per Thiago. Merge-request: 2430 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
| | | | * Fix SamegameAlan Alpert2010-07-191-2/+2
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Change to Behavior from Follow means that some of the previous assumptions are now incorrect. Script logic has been fixed. Task-number: QTBUG-12246
| | | * PathView doc clarification.Martin Jones2010-07-195-12/+27
| | |/
| | * Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105Martin Jones2010-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always place PathView delegates centered on the path The scale of the delegate was used to offset the item. This was a bad way of making the item appear to be positioned correctly when the default transform origin was the top-left. Now that transform origin is center, it is obvious that it was a bad idea. Task-number: QTBUG-12245 Reviewed-by: Michael Brasser
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-19298-2749/+10220
| | |\ | |_|/ |/| |
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-07-1731-145/+423
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (50 commits) Fix compilation after merge Fixed some network tests never being run. Remove test cases which cause stack overflow Avoid a crash in the OpenVG paint engine when clipping to an empty path Fix last character being overwritten in password field Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 038b62085831eef4dee423361c65ecd55b7b9b1d ) QSslSocket: Improve error handling Compile when bootstrapping qmake Fix regression in tst_qrand::testqrand() syncqt: don't try to split %module's values syncqt: fix wrong paths in include/ActiveQt/headers.pri Fix a crash when recursing into QSharedPointer from QSharedPointer::clear() Fix a couple of memory leaks due to not releasing CFTypes on Mac Initalize the nativeDialogInUse variable The Q_WGL define was removed years ago. Compile QUUid::createUuid() should not generate identical sequences on UNIX typos fixed Use lower case for including system header files Added trace statements to Phonon MMF backend ...
| * | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/network.pro
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-161-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed some network tests never being run.
| | | * | Fixed some network tests never being run.Rohan McGovern2010-07-161-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | This logic for private_tests was the opposite of what it should be, meaning that network tests which use Q_AUTOTEST_EXPORTs have not been run for some time :-(
| * | | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-17323-3084/+10957
| |\ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-172-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rebuild configure.exe. QDeclarativeDebugTrace: Do not send message if the client did not enabled CanvasFrameRate
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-172-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rebuild configure.exe. QDeclarativeDebugTrace: Do not send message if the client did not enabled CanvasFrameRate
| | * | | | Rebuild configure.exe.Jason McDonald2010-07-171-0/+0
| | | | | |
| | * | | | QDeclarativeDebugTrace: Do not send message if the client did not enabled ↵Olivier Goffart2010-07-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CanvasFrameRate This silents a lot of warnings in creator. Reviewed-by: Aaron Kennedy
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-175-11/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Used aligned load and store when possible for the blending of ARGB32" Used aligned load and store when possible for the blending of ARGB32 Windows mobile: hide [X] button in task bar on unmaximize Windows mobile: the [X] button in the taskbar minimizes the widget Windows mobile: show the [X] button in the taskbar when maximizing unused struct DIBINFO removed from qguifunctions_wince.cpp Fixes the Oracle invalid date bug when date is greater or equal to 2800
generated by cgit v0.12 at 2024-10-27 16:16:05 (GMT)