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-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
| | | | * | | Revert "Improve timer ID safety by using a serial counter per ID."Thiago Macieira2011-01-281-24/+6
| | | | * | | Invalidate QScriptPrograms when engine is destroyedKent Hansen2011-01-284-7/+42
| | | | * | | Fix alignment issue causing crash in QtScript/JavaScriptCoreKent Hansen2011-01-284-84/+76
| | | | * | | Restore Qt 4.6 behaviour: exec() always enters the event loop.Thiago Macieira2011-01-274-61/+221
| | | | * | | Make syncqt not complain about missing header macros.Thiago Macieira2011-01-271-0/+10
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-2910-86/+145
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix generated mif file cleaning in symbian-abldMiikka Heikkinen2011-01-282-2/+4
| | | | * | | Fix typo in qglthreads auto test.Jani Hautakangas2011-01-281-1/+1
| | | | * | | Orientation control implementation for Symbianmread2011-01-273-3/+52
| | | | * | | No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-275-81/+89
| | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-268-15/+54
| | | |\ \ \
| | | | * | | Fix: define hotSpot for Gestures on MacZeno Albisser2011-01-262-0/+7
| | | | * | | Fix warnings in PSQL driver: handle VersionUnknown in switchThiago Macieira2011-01-261-0/+6
| | | | * | | Fix warning in ODBC driver: passing NULL to non-pointer.Thiago Macieira2011-01-261-2/+2
| | | | * | | QNAM FTP: switch to binary mode before sending a SIZE commandThiago Macieira2011-01-261-1/+3
| | | | * | | Change the D-Bus signal filter to return NOT_YET_HANDLED for signalsThiago Macieira2011-01-261-2/+3
| | | | * | | Check if the interpolators have already been deleted.Thiago Macieira2011-01-261-4/+9
| | | | * | | Improve timer ID safety by using a serial counter per ID.Thiago Macieira2011-01-261-6/+24
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-261-4/+12
| | | |\ \ \ \
| | | | * | | | QComboBox popup incorrectly opened in Sym^3Sami Merila2011-01-261-4/+12
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-035-680/+1156
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Split QScriptQObject test into smaller functionsKent Hansen2011-02-031-4/+42
| * | | | | | | Split QScriptEngine test into smaller functionsKent Hansen2011-02-031-327/+529
| * | | | | | | Split QScriptContext autotest into smaller functionsKent Hansen2011-02-031-136/+194
| * | | | | | | Improve QScriptClass test coverageKent Hansen2011-02-031-1/+148