summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-17117-732/+1133
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-09404-8725/+19847
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-311-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Fix build with Clang for libpng versions 1.4.0 to 1.5.2Tor Arne Vestbø2011-08-311-0/+23
| | | | | | | | | | | | | | | | | | | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-09-017-13/+18
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | | | | | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-010-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | | | | | | | | | * | | Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-317-13/+18
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | * | | DEF file updateGareth Stockwell2011-08-312-2/+2
| | | | | | | | | | | | | | | | | | | | | * | | Merge branch 'qt-4.7' into 4.7Liang Qi2011-08-3145-284/+593
| | | | | | | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | | | | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-08-314-9/+14
| | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | * | | Prevent leakage of native window handlesGareth Stockwell2011-08-314-9/+14
| | | | | | | | | | | | | | | | | | | | | * | | | If automatic translation of input widget is off, skip resetSami Merila2011-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | | | | | | | * | | | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-31717-6654/+14172
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-3136-103/+328
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-301-8/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | Fix Symbian system date format parsing.Miikka Heikkinen2011-08-301-8/+55
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-3035-95/+273
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | Fix QXmlSimpleReader auto test failerHonglei Zhang2011-08-301-2/+1
| | * | | | | | | | | | | | | | | | | | | | | | | Fix pointer event mapping when windows are fixed to native orientationLaszlo Agocs2011-08-292-4/+38
| | * | | | | | | | | | | | | | | | | | | | | | | Fix incorrect Symbian version check.Miikka Heikkinen2011-08-241-3/+1
| | * | | | | | | | | | | | | | | | | | | | | | | Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.Miikka Heikkinen2011-08-243-4/+16
| | * | | | | | | | | | | | | | | | | | | | | | | Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-248-37/+47
| | * | | | | | | | | | | | | | | | | | | | | | | Fix def file paths for Symbian shadow buildsMiikka Heikkinen2011-08-241-6/+10
| | * | | | | | | | | | | | | | | | | | | | | | | Giving QUuid::createUuid() more entropy on Symbianmread2011-08-241-0/+6
| | * | | | | | | | | | | | | | | | | | | | | | | Enable running of XQuery test suiteHonglei Zhang2011-08-2415-40/+133
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'xmlExtRefBuffer'Honglei Zhang2011-08-244-1/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | QXmlSimpleReader handle external entity reference file over 1kHonglei Zhang2011-08-244-1/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-3149-859/+1685
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | don't crash when destroying the shortcutsKonstantin Ritt2011-08-301-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-29101-969/+1255
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-26105-351/+887
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-224-3/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | fix warningKonstantin Ritt2011-08-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | remove unused functionsOswald Buddenhagen2011-08-222-51/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | Make the DBus timeout configurable in QDBusAbstractInterface.David Faure2011-08-198-4/+149
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo in qt-conf docs.Casper van Donderen2011-08-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Fix build with the Clang compiler"Tor Arne Vestbø2011-08-181-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | Added missing no_include_pwd checkStyopa Semenukha2011-08-181-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-1814-21/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-1863-3025/+17812
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build with the Clang compilerTor Arne Vestbø2011-08-161-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Change spacing of title in offline style.Casper van Donderen2011-08-161-3/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-153-2/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | examples: fix compilation with namespaced Qt.hjk2011-08-158-6/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Russian translation updateSergey Belyashov2011-08-124-288/+687
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Update Japanese translations for Qt 4.8.Takumi ASAKI2011-08-124-468/+640
| * | | | | | | | | | | | | | | | | | | | | | | | | | | directfb: Include directfbgl.h directlyHolger Hans Peter Freyther2011-08-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: fix QNetworkProxyFactory testCorentin Chary2011-08-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | don't detach until the list is going to be modifiedRitt Konstantin2011-08-121-1/+0