summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-101-1/+1
|\
| * Use the thread-default glib context for the DBus connection in the ICD bearer...Jocelyn Turcotte2011-02-091-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-092-16/+15
|\ \
| * | QScriptEngine: fix property flags for native functionsCaio Marcelo de Oliveira Filho2011-02-092-16/+15
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-02-091-38/+36
|\ \ \
| * | | Cocoa: Mouse-grabbing in pop-up menus on OS X isn't workingRichard Moe Gustavsen2011-02-081-8/+13
| * | | Alien/Cocoa: popups in creator does not always work for press'n'holdRichard Moe Gustavsen2011-02-081-30/+23
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-091-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix building of examples with -no-webkitJohn Brooks2011-02-091-3/+3
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-091-0/+71
|\ \ \ \ | | |_|/ | |/| |
| * | | Add new tests cases to context tests.Jedrzej Nowacki2011-02-091-0/+71
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-074-9/+38
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-043-6/+33
| |\ \ \ \
| | * | | | Fix builds with compilers without --with-fpu=neon as a default.Robin Burchell2011-02-041-4/+3
| | * | | | Improve performance of partial updates in raster window surface on X11.Samuel Rødal2011-02-032-2/+30
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-031-3/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed MIT-SHM errors in QNativeImage.Samuel Rødal2011-02-031-3/+5
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-02243-41694/+17572
| |\ \ \ \ \ | | |/ / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-041-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix warning about deprecated conversions of string literals to char *hjk2011-02-041-2/+2
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-0418-1/+379
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Add QScriptClass/ByteArray benchmarkKent Hansen2011-02-0414-0/+159
| * | | | | Add Context2D QtScript benchmarkKent Hansen2011-02-045-1/+220
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-02-044-41/+10
|\ \ \ \ \ \
| * | | | | | Revert "Delay creation of the process manager"Harald Fernengel2011-02-044-41/+10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-032-0/+16
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | QtDBus: add support for QVariantHash out of the boxThiago Macieira2011-02-032-0/+16
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-0346-229/+520
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-0312-162/+155
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-039-156/+143
| | |\ \ \ \ \ \
| | | * | | | | | Fix QMutex can deadlock when calling tryLockOlivier Goffart2011-02-022-1/+42
| | | * | | | | | Fixed missing text when using static text items in GL 2 engine.Samuel Rødal2011-02-023-5/+14
| | | * | | | | | Prevent recursion when creating window surface.Samuel Rødal2011-02-021-1/+7
| | | * | | | | | Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.Samuel Rødal2011-02-021-7/+16
| | | * | | | | | document that QThread::exit will exit future event loopsOlivier Goffart2011-02-021-4/+6
| | | * | | | | | Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."Olivier Goffart2011-02-022-138/+58
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-023-6/+11
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fix for QTBUG-17035kranthi2011-02-021-3/+3
| | | * | | | | | Carefull free the data from XGetWindowProperty on X11.Denis Dzyubenko2011-02-021-1/+3
| | | * | | | | | Fixes memory leaks in QX11EmbedDenis Dzyubenko2011-02-021-2/+5
| * | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Olivier Goffart2011-02-0311-5/+86
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-025-11/+24
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-015-11/+24
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-013-1/+9
| | | * | | | | | | Fix a crash when undoing form layoutJarek Kobus2011-02-012-10/+15
| * | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-0232-254/+539
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-0132-254/+539
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-3015-179/+358
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-2915-179/+358
| | | | |\ \ \ \ \ \ | | | |/ / / / / / /
| | | | * | | | | | Fix potential networking crash due to null-pointer dereferenceSimon Hausmann2011-01-281-3/+3