summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-233468-132850/+286264
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-233387-131064/+284396
| |\
| | * Skip complex FBO tests if combined depth-stencil isn't supportedTom Cooksey2010-02-231-1/+16
| | * Make tst_QGL::glWidgetRendering use same test as FBO autotestTom Cooksey2010-02-231-39/+47
| | * Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6...Jocelyn Turcotte2010-02-234-15/+21
| | * Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ce...Jocelyn Turcotte2010-02-233331-130665/+283653
| | * Adjust the mkdist-webkit script before the importation of WebKit.Jocelyn Turcotte2010-02-231-12/+24
| | * Make mediaservices use existing GStreamer qmake varsTom Cooksey2010-02-232-21/+4
| | * Detect GStreamer even when we're not building phononTom Cooksey2010-02-231-23/+24
| | * Fix build on systems without XVideo headersTom Cooksey2010-02-231-1/+1
| | * Make the XVideo configure test actually pass if XV is presentTom Cooksey2010-02-232-0/+2
| | * Add a configure test for XVideo supportTom Cooksey2010-02-233-1/+55
| | * Fixed cosmetic glitch in QTabBar label's renderingGabriel de Dietrich2010-02-231-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-23119-1930/+2183
| |\ \
| | * \ 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
| | | | |/ / / /
| | | | | | * | 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
| | | | | | | * | Cocoa: Fix build with namespaceRichard Moe Gustavsen2010-02-224-5/+4
| | | | | | | * | Cocoa: namespace build fixRichard Moe Gustavsen2010-02-221-1/+2
| | | | | | * | | qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-223-3/+29
| | | | | | |/ /
| | | | | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-221-1/+1
| | | | | | |\ \
| | | | | | | * | Don't include private headers from public headers.Morten Johan Sørvig2010-02-221-1/+1
| | | | | | * | | doc: Fixed some qdoc errors.Martin Smith2010-02-225-10/+10
| | | | | | |/ /
| | | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2299-1903/+2069
| | | | | | |\ \ | | | | | |/ / /
| | | | | | * | Merge branch 'master' of git:qt/qtThiago Macieira2010-02-21783-70029/+58894
| | | | | | |\ \
| | | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2099-1903/+2069
| | | | | | |\ \ \