summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-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-03-301-1/+1
| |\ |/ /
| * QS60Style: Custom QPushButton: Heigth is calculated wronglySami Merila2010-03-301-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-3012-95/+322
|\ \ | |/ |/|
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-307-39/+305
| * do not detect the echo-without-newline syntax over and overOswald Buddenhagen2010-03-301-30/+12
| * speed up by removing nonsenseOswald Buddenhagen2010-03-301-6/+1
| * no need for CONFIG += ordered hereOswald Buddenhagen2010-03-301-2/+0
| * Autotest: don't allow choosing between debug/release mode.Thiago Macieira2010-03-303-18/+4
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-304-3/+44
|\ \ | |/ |/|
| * Added additional logging to Phonon MMF backendGareth Stockwell2010-03-304-3/+44
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-301-0/+3
|\ \
| * | Fix a crash in QGtkStyle when theme not availableJens Bache-Wiig2010-03-301-0/+3
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-293-0/+7
|\ \ \ | | |/ | |/|
| * | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-0/+2
| * | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-292-11/+17
|\ \
| * | Fixed crash in Phonon MMF backend during application shutdownGareth Stockwell2010-03-291-1/+7
| * | Fixed bitfield-related crash on Symbian WINSCWGareth Stockwell2010-03-291-10/+10
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-296-14/+51
|\ \ \ | | |/ | |/|
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-295-14/+46
| * | Compile with MSVC 2005 and 2003 when no platform SDK is usedAndy Shaw2010-03-291-0/+5
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-2926-137/+481
|\ \ | |/ |/|
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-293-3/+14
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-2925-135/+468
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-291-9/+18
|\ \
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-295-22/+68
| |\ \
| * | | QS60Style: very tall QSpinBox's buttons hide lineEditSami Merila2010-03-291-9/+18
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-292-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Export QGLContextResource for use with Qt/3DRhys Weatherley2010-03-291-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-291-0/+3
| |\ \ \ |/ / / /
| * | | Use QSKIP rather than commenting a failure.Alexis Menard2010-03-291-0/+3
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-17/+48
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-17/+48
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-17/+48
| | |\ \
| | | * | Fix compile error on Symbian 9.1, caused in network/access.Frans Englich2010-03-262-14/+33
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-3/+15
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-3/+15
| | | | |\ \
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-3/+15
| | | | | |\ \
| | | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-253-3/+15
| | | | | | |\ \
| | | | | | | * | QNAM HTTP: Symbian compile fixMarkus Goetz2010-03-251-0/+1
| | | | | | | * | tst_qnetworkreply: Fix side effect, add another testMarkus Goetz2010-03-251-1/+12
| | | | | | | * | QNAM HTTP: Fix crazy crash when exiting applicationMarkus Goetz2010-03-252-2/+2
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-261-15/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Refactor QDirectFBPixmap::fromImage slightlyAnders Bakken2010-03-261-14/+9
| * | | | | | | | QDirectFBPixmap can handle NoOpaqueDetection.Anders Bakken2010-03-261-1/+1
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-262-2/+47
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | QInputContextFactory::languages implementation for Symbian.Janne Anttila2010-03-262-2/+47
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-263-20/+21
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Reverts using composition mode when using DeviceCoordinateMode cache.Yoann Lopes2010-03-262-14/+17