summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2021-10/+513
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add a missing file in the config.test for SSE 4.2 Remove the masking when computing qAlpha() Add support for more vector instructions on x86 Workaround gcc bug, disable test with old version of gcc Do not crash due to a infinite recursion when using voiceover on MacOS doc: Fix qdoc errors for text related files QGraphicsItem: Animation leaves drawing artifacts when clipping is used. moc: Slot with complex template default value does not compile
| * Add a missing file in the config.test for SSE 4.2Benjamin Poulain2010-07-201-0/+3
| | | | | | | | | | The pro file was accidently missing of 42267701edd266463c90cec82d45022446a2606a
| * Remove the masking when computing qAlpha()Benjamin Poulain2010-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | After a bit shift of 24, only the alpha value should remain, so it is not necessary to mask the result. The documentation state QRgb works on a ARGB quadruplet, so the upper bits can be assumed to be zero in the cases when QRgb is 64 bits. This saves some time because qAlpha() is used for each pixel in the generic blend functions. Reviewed-by: Andreas Kling Reviewed-by: Kim
| * Add support for more vector instructions on x86Benjamin Poulain2010-07-2012-1/+386
| | | | | | | | | | | | | | | | Add the configuration, autodetection, and the #define for vector instructions on x86. The configuration has been extended with 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 ↵Qt Continuous Integration System2010-07-207-8/+123
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Workaround gcc bug, disable test with old version of gcc Do not crash due to a infinite recursion when using voiceover on MacOS doc: Fix qdoc errors for text related files QGraphicsItem: Animation leaves drawing artifacts when clipping is used. moc: Slot with complex template default value does not compile
| | * Workaround gcc bug, disable test with old version of gccOlivier Goffart2010-07-201-0/+4
| | |
| | * Merge branch 'QTBUG-6843' into 4.7Jan-Arve Sæther2010-07-201-2/+2
| | |\
| | | * Do not crash due to a infinite recursion when using voiceover on MacOSJan-Arve Sæther2010-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the infinite recursion was that QAccessibleTitleBar::object() returned the titlebar's dockwidget. This could lead to a problem when the AT client tried to traverse the accessibility hierarchy: As a response to QAXChildrenAttribute (retrieve children) on a dock widget node, it would register it's children in the hierarchy manager. In this case, the object registered for the titlebar interface was the QDockWidget. In order to do further traversal, the bridge could call queryAccessibleInterface on the list of retrieved children to get the QAccessibleInterface for those objects, however, that would return the QAccessibleDockWidget interface that we just had traversed,.... Task-number: QTBUG-6843 Reviewed-by: Carlos Manuel Duclos Vergara
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-07-202-1/+79
| | |\ \
| | | * | QGraphicsItem: Animation leaves drawing artifacts when clipping is used.Bjørn Erik Nilsen2010-07-202-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only happens when the ItemHasNoContents and ItemClipsChildrenToShape flags are set. Problem is that items with no content are threated as 'dummy' items, which means they are never drawn or 'processed' otherwise, so the cached bounding rect is not reliable/usable. This means that in case of changing the geometry of such items, its children always have to take care of invalidating the occupied areas and the update can not be clipped to the item's bounding rect. Regression after commit: c1c7dbf2 Auto test included. Task-number: QTBUG-11504 Reviewed-by: yoann
| | * | | doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-202-4/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextBlock::layoutDirection() doesn't exist, and the QStaticText constructor no longer takes a size argument. Task-number: QTBUG-12072 Reviewed-by: Fabien Freling
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-202-1/+36
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: moc: Slot with complex template default value does not compile
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-202-1/+36
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: moc: Slot with complex template default value does not compile
| | | | * | moc: Slot with complex template default value does not compileOlivier Goffart2010-07-192-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way we detect the end of a default argument does not take in account template parametter. It is unfortunatelly not trivial to do it properly without semantic information So we will use heuristics and if the number of < matches the number of > we consider it is a template. Or if we have a '=' we consider it is not a template. Task-number: QTBUG-12260 Reviewed-by: Roberto Raggi
* | | | | | 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
| | |\ \ \