summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
|\
| * Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-0215-68/+111
|\ \
| * \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-0215-68/+111
| |\ \
| | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-0115-68/+111
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-011-17/+40
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-301-17/+40
| | | | |\ \
| | | | | * | Fix bold text rendering of Thai and Vietnamese on SymbianAlessandro Portale2010-04-301-17/+40
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-014-13/+32
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-304-13/+32
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-304-13/+32
| | | | |\ \ \
| | | | | * | | Fixed a leak in QTextDocument::print().Trond Kjernåsen2010-04-292-8/+5
| | | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-292-5/+27
| | | | | |\ \ \
| | | | | | * | | Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.Jan-Arve Sæther2010-04-292-5/+27
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-303-3/+25
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-303-3/+25
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | | * | | | | Fix crash in QDBusInterface when invoking a method in a derived class.Thiago Macieira2010-04-292-1/+23
| | | | | * | | | | tst_selftest: Fix off-by-one error in cleaning up line numbers and filenamesThiago Macieira2010-04-291-2/+2
| | | | | |/ / / /
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-303-38/+96
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | / / | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Event dispatcher slow down using delays rather than thread prioritymread2010-04-302-37/+95
| | | | * | | | Fixed incorrect runtime platform version check in Phonon MMF backendGareth Stockwell2010-04-301-1/+1
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-307-126/+47
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | / / / | | | | |/ / / | | | |/| | |
| | | | * | | Removing unused code.Alessandro Portale2010-04-302-27/+2
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-295-99/+45
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Support 'Text' mode in Symbian specific input methodsSami Merila2010-04-291-1/+1
| | | | * | | Map Symbian touch points to the screen's coordinate system.Jason Barron2010-04-291-1/+1
| | | | * | | Revert "Event dispatcher slow down using delays rather than thread priority"Miikka Heikkinen2010-04-292-95/+37
| | | | * | | Fix long menu item texts causing crashMiikka Heikkinen2010-04-291-2/+6
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-02110-1671/+4581
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-02110-1671/+4581
| |\ \ \ \ \ |/ / / / / /
| * | | | | Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774Simon Hausmann2010-04-307-3/+87
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-30107-1671/+4497
| |\ \ \ \ \
| | * | | | | Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65aSimon Hausmann2010-04-304-32/+73
| | * | | | | Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3Simon Hausmann2010-04-296-10/+31
| | * | | | | Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9dSimon Hausmann2010-04-299-74/+174
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-28107-1578/+4242
| | |\ \ \ \ \
| | | * | | | | Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27Simon Hausmann2010-04-28107-1578/+4242
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-0283-1976/+3467
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-3083-1976/+3467
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | bye bye QMakeProjectEnvOswald Buddenhagen2010-04-302-51/+5
| | * | | | | | | short-cut evaluation inside if() testsOswald Buddenhagen2010-04-301-6/+3
| | * | | | | | | eliminate special splitting of INCLUDEPATH and DEPENDPATHOswald Buddenhagen2010-04-301-5/+3
| | * | | | | | | do not env-expand cache file pathOswald Buddenhagen2010-04-301-1/+1
| | * | | | | | | s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/Oswald Buddenhagen2010-04-301-1/+1
| | * | | | | | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-04-301-2/+2
| | * | | | | | | s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/Oswald Buddenhagen2010-04-3050-50/+50
| | * | | | | | | teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)Oswald Buddenhagen2010-04-301-8/+7
| | * | | | | | | warn about usage of deprecated variablesOswald Buddenhagen2010-04-301-0/+5
| | * | | | | | | warn about using non-lowercased replace $$function()sOswald Buddenhagen2010-04-301-1/+5
| | * | | | | | | add -Wdeprecated option (on by default)Oswald Buddenhagen2010-04-302-3/+8