summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2026-269/+634
|\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make Item::transformOriginPoint read-only Ensure the boundingRect() of Text is correctly calculated. Better defaults for MouseArea's drag. various doc improvements for animation elements fixes for dynamic object creation docs Change docs to show how to define enum properties Improve documentation on setting arbitray transform origin points Ensure released VisualItemModel items are removed from the scene. Improve QML text rendering when LCD smoothing is enabled for OS X.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-2021-262/+555
| |\
| | * Ensure the boundingRect() of Text is correctly calculated.Michael Brasser2010-07-202-0/+3
| | | | | | | | | | | | | | | | | | | | | We need to create our cached image in boundingRect() if it doesn't already exist, to prevents painting errors. Reviewed-by: Warwick Allison
| | * Better defaults for MouseArea's drag.Michael Brasser2010-07-202-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow essentially unbounded dragging once drag.target is set. The previous default of contraining the dragging to 0,0 (i.e. no drag) was unintuitive for learners. It's rare that unbounded is actually what you want, but it makes it much easier to get started with the element. Task-number: QTBUG-11184 Reviewed-by: Martin Jones
| | * various doc improvements for animation elementsBea Lam2010-07-2012-188/+445
| | |
| | * fixes for dynamic object creation docsBea Lam2010-07-204-63/+84
| | |
| | * Change docs to show how to define enum propertiesBea Lam2010-07-201-6/+20
| | |
| * | Make Item::transformOriginPoint read-onlyMartin Jones2010-07-201-0/+1
| |/ | | | | | | | | | | | | | | | | Using this property on Item will break transformOrigin property. We have never documented it. It should not have been used. Now it is enforced as best we can. Task-number: QTBUG-12265 Reviewed-by: Aaron Kennedy
| * Improve documentation on setting arbitray transform origin pointsMartin Jones2010-07-201-0/+7
| | | | | | | | | | | | | | | | transformOriginPoint is undocumented for a reason. It shouldn't be used by Item. Added some docs to assist find the right way, i.e. Scale and Rotation elements. Task-number: QTBUG-12265
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-2039-1491/+462
| |\
| | * Improve QML text rendering when LCD smoothing is enabled for OS X.Michael Brasser2010-07-192-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text in QML is always painted into a pixmap, and with sub-pixel antialiasing enabled this produced incorrect results. This patch is a temporary fix until QTBUG-12252 and/or QTBUG-7747 can be properly addressed in a patch release. In the worst case, if using QML and QPainters are being constructed in a non-GUI thread, this patch could potentially turn off sub-pixel antialiasing for them. Task-number: QTBUG-11002 Reviewed-by: Aaron Kennedy Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | Ensure released VisualItemModel items are removed from the scene.Martin Jones2010-07-203-7/+39
| | | | | | | | | | | | | | | | | | Also parent them back to the VIM to ensure correct destruction. Task-number: QTBUG-12261
* | | 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.
* \ \ \ \ 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
| | |\ | |_|/ |/| |