summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-1 into 4.6-integ...Qt Continuous Integration System2010-06-031-0/+6
|\
| * qmake: don't warn about unknown MSVC compiler option /MPJoerg Bornemann2010-06-021-0/+6
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-023-6/+48
|\ \
| * | Clipping with rounded rectangles and QVG_SCISSOR_CLIPRhys Weatherley2010-06-023-6/+48
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-021-3/+0
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-011-3/+0
| |\ \ |/ / /
| * | Remove workarounds for -rpath-link optionsAdrian Constantin2010-06-011-3/+0
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-011-0/+2
|\ \ \ | | |/ | |/|
| * | Fixed alpha check for mono images.Kim Motoyoshi Kalland2010-06-011-0/+2
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-311-12/+0
|\ \ | |/ |/|
| * Removed bogus autotest QFontMetrics::bearingIncludedInBoundingRectEskil Abrahamsen Blomfeldt2010-05-311-12/+0
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-313-2/+12
|\ \
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-313-2/+12
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-311-4/+1
|\ \ \ | |_|/ |/| |
| * | Always construct s60 screen furniture even if not used.Janne Koskinen2010-05-311-4/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-315-4/+13
|\ \ \ | |_|/ |/| |
| * | Fix antialiasing with transformed text in OpenGL2 paint engineEskil Abrahamsen Blomfeldt2010-05-315-4/+13
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-302-12/+28
|\ \ \ | |_|/ |/| |
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-302-12/+28
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-285-434/+76
|\ \ \ | |_|/ |/| |
| * | Update def files for 4.6.3Shane Kearns2010-05-285-434/+76
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-284-14/+44
|\ \ \ | |/ / |/| |
| * | test QMultiMap::operator+= and QMultiHash::operator+=Olivier Goffart2010-05-282-0/+40
| * | QMultiMap/QMultiHash: must qualify identifier to find this declaration in de...Olivier Goffart2010-05-282-14/+4
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-281-2/+2
|\ \ \ | |_|/ |/| |
| * | Handle exceptions notified by select before read/write.Janne Anttila2010-05-281-2/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-282-58/+63
|\ \ \
| * | | Added support for Indonesian language on Symbian.Denis Dzyubenko2010-05-281-1/+2
| * | | Fix for Norwegian and Korean languages on symbian.Denis Dzyubenko2010-05-282-60/+62
| * | | Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-281-0/+2
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-281-0/+41
|\ \ \ \ | | |/ / | |/| |
| * | | Add missing license header.Jason McDonald2010-05-281-0/+41
|/ / /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-272-9/+20
|\ \ \ | |_|/ |/| |
| * | Fixes for the s60theme toolAlessandro Portale2010-05-272-9/+20
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-273-4/+7
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-273-4/+7
| |\ \ | | |/ | |/|
| | * Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | * Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-273-2/+5
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-272-1/+5
|\ \ \ | |/ / |/| |
| * | Post QResizeEvent from QSymbianControl::SizeChanged even when invisibleGareth Stockwell2010-05-271-0/+3
| * | Moved Symbian-specific .pro directive into symbian{} blockGareth Stockwell2010-05-271-1/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-271-0/+24
|\ \ \ | |/ / |/| |
| * | Added some changes for 4.6.3Jens Bache-Wiig2010-05-271-0/+24
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-271-0/+4
|\ \ \
| * | | Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.Liang Qi2010-05-271-0/+4
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-262-8/+305
|\ \ \ \ | | |/ / | |/| |
| * | | Allow auto-test to compile when using namespacesJoão Abecasis2010-05-261-4/+5
| * | | Fix regression in QVarLengthArray::operator=João Abecasis2010-05-262-8/+304
|/ / /