summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Benjamin Poulain2010-02-234554-116093/+517052
|\
| * Merge remote branch 'origin/master'Thiago Macieira2010-02-23285-2838/+2662
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2311-158/+236
| | |\
| | | * clean up x11 desktop detectionOswald Buddenhagen2010-02-222-90/+31
| | | * avoid double reallocations in inserting operationsOswald Buddenhagen2010-02-222-35/+143
| | | * create temporaries more intelligentlyOswald Buddenhagen2010-02-221-6/+28
| | | * do not protect against self-assignment in QList::replace()Oswald Buddenhagen2010-02-221-6/+1
| | | * make queues to which only lists are appended not blow the memoryOswald Buddenhagen2010-02-222-18/+19
| | | * optimize queue-like structuresOswald Buddenhagen2010-02-221-3/+3
| | | * remove more pointless recalculationsOswald Buddenhagen2010-02-221-3/+3
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-227-8/+19
| | | |\
| | | | * Fix compilation with namespace.ck2010-02-226-6/+17
| | | | * Fix compilation with namespace.ck2010-02-221-2/+2
| | * | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-232-1/+15
| | |\ \ \
| | | * \ \ Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-222-1/+15
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Merge remote branch 'origin/master' into integration-master-from-4.6Rohan McGovern2010-02-221-1/+1
| | | | |\ \ | | | | | |/
| | | | * | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-222-1/+15
| | | | |\ \
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-222-1/+15
| | | | | |\ \
| | | | | | * | Don't process uic3 subdir if qt3support is disabled.Rohan McGovern2010-02-221-1/+3
| | | | | | * | Fixed failure of tst_symbols when Qt is configured with -qtnamespaceRohan McGovern2010-02-221-0/+12
| | | | | |/ /
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-23277-2687/+2419
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-225-0/+5
| | | |\ \ \ \
| | | | * | | | Updated based on change to transformOrignNigel Hietala2010-02-225-0/+5
| | | * | | | | Documentation UpdateAlan Alpert2010-02-221-1/+5
| | | |/ / / /
| | | * | | | Doc fixAlan Alpert2010-02-221-1/+1
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22947-72470/+61700
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-22268-2665/+2384
| | | | |\ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | | * | | | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-22113-2218/+1931
| | | * | | | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
| | | |/ / / /
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-221-0/+5
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-2210-93/+83
| | | | |\ \ \ \
| | | | * | | | | Update QmlChanges with animation API changes.Michael Brasser2010-02-221-0/+5
| | | * | | | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-22144-307/+310
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2217-90/+89
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-2212-47/+55
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Increase durations when testing Behaviors.Michael Brasser2010-02-2210-24/+24
| | | | * | | | | Fix compile error on SolarisAaron Kennedy2010-02-227-66/+65
| | | * | | | | | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | | * | | | | | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Add cached path rounded rect painting benchmark.Martin Jones2010-02-221-0/+24
| | | * | | | | Remove use of direct event posting. Use QTest::keyClick() for keys.Martin Jones2010-02-221-23/+7
| | | |/ / / /
| * | | | | | Use QTRY_COMPARE to give the animation a chance to finishKent Hansen2010-02-231-1/+2
| * | | | | | Cocoa: Sheets loose their opacity on 2nd showRichard Moe Gustavsen2010-02-231-2/+3
| * | | | | | Added function overload for QByteArray &QByteArray::replace()Zeno Albisser2010-02-233-1/+28
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-22115-1928/+2152
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Second attempt at work-around for MSVC2008 compiler crashKent Hansen2010-02-221-0/+5
| | * | | | | QNativeSocketEngine: Fix some error handling related to waitFor*()Markus Goetz2010-02-222-0/+31
| | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-2212-19/+15
| | |\ \ \ \ \
| | | * | | | | Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-227-13/+9