summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Olivier Goffart2011-02-0311-5/+86
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-037-3/+44
| |\
| | * Merge branch 'integration'Yoann Lopes2011-02-027-3/+44
| | |\
| | | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-01-317-3/+44
| | | |\
| | | | * Fixes lastResortFamily() on Symbian when using FreeType.Yoann Lopes2011-01-311-2/+16
| | | | * Fixes compilation when using FreeType on Symbian.Yoann Lopes2011-01-316-1/+28
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-024-2/+42
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Load modules from QMAKEPATHYury G. Kudryashov2011-02-021-1/+5
| | * | | fix windows configure compilation after lighthouse mergeOswald Buddenhagen2011-02-021-0/+2
| | * | | Allow the user to select imageformats to be built as plugin vs internalBernhard Rosenkraenzer2011-02-022-1/+35
| |/ / /
* | | | 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-012-4/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refactoring of tst_QScriptEngine::automaticSemicolonInsertion test.Jedrzej Nowacki2011-02-011-4/+4
| * | | | | | Add new test to tst_QScriptContextInfo.Jedrzej Nowacki2011-02-011-0/+8
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-01-291-0/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-01-281-0/+4
| |\ \ \ \ \ \
| | * | | | | | Incorrect comparison result in QString::localeCarlos Manuel Duclos Vergara2011-01-281-0/+4
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-01-282-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge remote branch 'qt-fire-review/master'aavit2011-01-282-1/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-01-2610813-25846/+121729
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.Samuel Rødal2011-01-262-1/+11
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-284-32582/+16
|\ \ \ \ \ \ \