summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump version number after 4.6.3 release.Jason McDonald2010-06-1519-24/+24
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-125-5/+5
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-115-5/+5
| |\
| | * Allow to build Qt in static with mingwThierry Bastian2010-06-115-5/+5
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-123-12/+57
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-113-12/+57
| |\ \ |/ / /
| * | Thread safety for QFontEngineS60Shane Kearns2010-06-113-12/+57
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1010-81/+116
|\ \ \
| * | | QLocalSocket: don't emit readChannelFinished() twice on WindowsJoerg Bornemann2010-06-102-1/+4
| * | | QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamedJoerg Bornemann2010-06-102-6/+8
| * | | QLocalSocket: fix reading from a socket after broken connectionJoerg Bornemann2010-06-102-7/+19
| * | | QLocalServer: make many simultaneous connection attempts work on WindowsJoerg Bornemann2010-06-102-1/+6
| * | | tst_QLocalSocket::threadedConnection autotest stabilizedJoerg Bornemann2010-06-101-26/+12
| * | | tst_qlocalsocket: pro files of client / server examples fixedJoerg Bornemann2010-06-102-12/+0
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-103-29/+68
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-100-0/+0
|\ \ \ \ | |/ / /
| * | | Merge commit 'v4.6.3' into 4.6Thiago Macieira2010-06-090-0/+0
| |\ \ \
* | \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
| |\ \ \ \ |/ / / / /
| * | | | Merge commit 'v4.6.3' into 4.6Jason McDonald2010-06-080-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...v4.6.3Simon Hausmann2010-06-013-2/+12
| | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-012-12/+28
| | * | | Always construct s60 screen furniture even if not used.Janne Koskinen2010-06-011-4/+1
| | * | | Change to release licenses for 4.6.3.Jason McDonald2010-05-308885-115693/+115693
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-075-0/+108
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fix translations from some header files being omittedOswald Buddenhagen2010-06-075-0/+108
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-392/+370
|\ \ \ \ \ | |/ / / /
| * | | | Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-1/+1
|\ \ \ \
| * | | | Fix style sheet error with slider handleqCaro2010-06-071-1/+1
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-041-370/+392
|\ \ \ \ \
| * | | | | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-041-4/+26
| * | | | | syncqt: tabs changes to spacesJoerg Bornemann2010-06-041-369/+369
| |/ / / /
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-043-6/+40
|\ \ \ \ \ | |/ / / /
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-043-6/+40
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-032-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | fix misleading hintOswald Buddenhagen2010-06-031-1/+1
| * | | | support TARGETs with spacesOswald Buddenhagen2010-06-031-3/+3
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-032-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| * | | double-quote string which contains a single-quoteOswald Buddenhagen2010-06-031-1/+1
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-031-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix the bindTexture() filters on X11 to not rely on mipmap generation.Trond Kjernåsen2010-06-031-0/+3
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-36/+378
|\ \ \ \
| * | | | Fix QWS build failureGareth Stockwell2010-06-031-1/+1
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-35/+377
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-35/+377
| | |\ \ \ \
| | | * | | | Removed compiler warningsGareth Stockwell2010-06-026-2/+14
| | | * | | | Window visibility changes update TLW backing store reference countGareth Stockwell2010-06-022-8/+17
| | | * | | | Enable visibility change events on all Symbian native windowsGareth Stockwell2010-06-021-0/+1