summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not use global static const references to objectsOlivier Goffart2010-08-262-6/+6
* Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"Olivier Goffart2010-08-261-67/+66
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-269-96/+208
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-259-96/+208
| |\
| | * Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.Bjørn Erik Nilsen2010-08-251-7/+3
| | * Refactor blend_transformed_bilinear to simplify the blend type checkingBenjamin Poulain2010-08-251-66/+67
| | * Note RTL behavior changes in docs and changelogJiang Jiang2010-08-252-0/+14
| | * Implement qt_memfill32 with Neon.Benjamin Poulain2010-08-253-0/+40
| | * Implement the composition mode Plus with Neon.Benjamin Poulain2010-08-255-22/+83
| | * Fix the broken unicode detection of ODBC driver.Charles Yin2010-08-251-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-253-3/+13
|\ \ \ | |/ / |/| |
| * | Enabling AdvancedPointerEvents for active windows causes a panicSami Merila2010-08-253-3/+13
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-254-5/+66
|\ \
| * | Remove enums from bitfield, since all compilers do not support them.Janne Anttila2010-08-251-4/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-243-1/+62
| |\ \
| | * | Fixed compile error in runonphone.axis2010-08-241-0/+2
| | * | Use QImage 'convertInPlace' versions in QVGPixmapData load functions.Jani Hautakangas2010-08-242-1/+60
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2529-87/+635
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2513-67/+148
| |\ \ \
| | * | | Fix responseText to check the charset encoding field and also to notBea Lam2010-08-254-21/+110
| | * | | Re-insert and emit the correct NOTIFY signals following the removalBea Lam2010-08-254-2/+8
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-251-15/+7
| | |\ \ \
| | * | | | Alignment of shadow for rich text is broken when using text stylesYann Bodson2010-08-251-3/+3
| | * | | | typoYann Bodson2010-08-251-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2512-1/+463
| | |\ \ \ \
| | * | | | | Setting one dimension of the sourceSize should set the other dimension.Yann Bodson2010-08-253-40/+26
| |/ / / / / |/| | | | |
| * | | | | Don't circumvent onDestruction handlers when clearing expression in delegate ...Martin Jones2010-08-253-4/+17
| | |/ / / | |/| | |
| * | | | Fix poor flicking behavior with slower flicks.Martin Jones2010-08-251-15/+7
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2518-46/+260
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-2418-46/+260
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Stabilize tst_qgraphicssceneOlivier Goffart2010-08-241-2/+2
| * | QDeclarativeDebug: send a message when new object are addedOlivier Goffart2010-08-245-2/+27
| * | QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-243-9/+14
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-2412-35/+219
| |\ \ |/ / /
| * | Fix mispositioned text with QStaticText and OpenVG graphics systemEskil Abrahamsen Blomfeldt2010-08-241-2/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-08-24597-36258/+42775
| |\ \
| | * | QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, ...Olivier Goffart2010-08-242-1/+29
| | * | Fix tst_Collections::QTBUG13079_collectionInsideCollectionOlivier Goffart2010-08-241-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-247-18/+156
| | |\ \
| | | * | Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itselfOlivier Goffart2010-08-232-8/+54
| | | * | Fix assignment of a container included in the container itselfOlivier Goffart2010-08-236-10/+102
| * | | | Use binarysort to find items.Gunnar Sletta2010-08-242-14/+29
| | | | * Document calling QObject methods from QML in Extending QML in C++ docs.Martin Jones2010-08-2512-1/+463
| |_|_|/ |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-241-1/+2
|\ \ \ \
| * | | | Added an install target to runonphone.axis2010-08-241-1/+2
| | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2420-39/+66
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2417-68/+48
| |\ \ \
| | * | | Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-2410-12/+12
| | * | | Use SpringAnimation in relevant examples again.Michael Brasser2010-08-242-5/+5
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-236-16/+20
| |\ \ \ \ | | | |_|/ | | |/| |