summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-311-6/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-03-3110-294/+8
| | |\ \ \ \
| | * | | | | Allow attributes to be bound after a QGLShaderProgram is linked.Rhys Weatherley2010-03-311-6/+13
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-311-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix translation mistake spotted by Laurent MontelDavid Faure2010-03-311-1/+1
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06318-5597/+6800
| |\ \ \ \ \ \ \
| | * | | | | | | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| * | | | | | | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-066-3/+31
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Doc: update the QDBusPendingCallWatcher example to show where to deleteThiago Macieira2010-04-061-0/+1
| * | | | | | | | | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
| * | | | | | | | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-063-1/+21
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / /
| * | | | | | | | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
| * | | | | | | | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-062-1/+6
| * | | | | | | | | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++Zeno Albisser2010-04-061-0/+15
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-068-2/+490
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-06244-4153/+4402
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-068-2/+491
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-064-8/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Empty commit to trigger rebuilding in the CI system.Thiago Macieira2010-04-050-0/+0
| * | | | | | | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-041-18/+20
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-041-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-053-7/+3
| | | * | | | | | | | | | Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixedThiago Macieira2010-04-041-1/+1
| | |/ / / / / / / / / /
| | * | | | | | | | | | Revert "Attempt at fixing Phonon build issue on Symbian."Thiago Macieira2010-04-041-18/+20
| |/ / / / / / / / / /
| * | | | | | | | | | Attempt at fixing Phonon build issue on Symbian.Thiago Macieira2010-04-041-3/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-031-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [plugins] Don't conclude that a .debug file is a plugin.Thiago Macieira2010-04-031-0/+14
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0223-3525/+3724
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0223-3525/+3724
| |\ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / /
| * | | | | | | | | | | Revert "Make s60main static lib not depend on QtCore"Iain2010-04-022-48/+5
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0124-3530/+3772
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0184-1437/+1903
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0124-3531/+3772
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0124-3531/+3772
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-3124-3531/+3772
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Fix regression on SymbianShane Kearns2010-03-311-1/+1
| | | | | * | | | | | | | | | | Fix broken test caseShane Kearns2010-03-311-0/+7
| | | | | * | | | | | | | | | | Cleanup the deployment codeThomas Zander2010-03-315-10/+8
| | | | | * | | | | | | | | | | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| | | | | * | | | | | | | | | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-31210-2558/+5930
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Re-add line that was lost during webkit update.Thomas Zander2010-03-301-0/+1