summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-2751-1061/+974
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-2726-278/+770
| |\
| | * Merge remote-tracking branch 'earth-staging/master'Olivier Goffart2011-05-263-18/+12
| | |\
| | | * symbian socket engine: share ip address conversion codeShane Kearns2011-05-253-18/+12
| | * | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-268-76/+52
| | |\ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-244256-73821/+73652
| | |\ \
| | * | | QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."Peter Hartmann2011-05-241-4/+4
| | * | | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCoreRobert Hogan2011-05-2410-51/+214
| | * | | fix Symbian ordinals for merge request re. utf8 characters in SSL certsPeter Hartmann2011-05-241-1/+5
| | * | | fix coding style for merge request re. utf8 characters in SSL certsPierre Rossi2011-05-231-7/+6
| | * | | Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerNameRaul Metsma2011-05-233-36/+29
| | * | | Fix the build for QUuidLiang Qi2011-05-232-2/+6
| | * | | Improved performance of the QLocale::name() function.Denis Dzyubenko2011-05-201-9/+22
| | * | | Optimize QUuid::QUuid(const char *)Liang Qi2011-05-201-1/+9
| | * | | QDataStream: speedup steaming of QUuid.Liang Qi2011-05-201-17/+47
| | * | | Add QUuid::toRfc4122() and fromRfc4122()Liang Qi2011-05-202-0/+94
| | * | | Add QUuid::toByteArray() and relevantLiang Qi2011-05-202-0/+81
| | * | | Optimize QUuid::toString() and relevantLiang Qi2011-05-202-55/+100
| | * | | Fix typo in commentOlivier Goffart2011-05-201-1/+1
| | * | | MSVC do not really support initilizer_listOlivier Goffart2011-05-191-6/+2
| | * | | Support of lambdas in QtConcurrent::runOlivier Goffart2011-05-195-81/+127
| | * | | Add QtPrivate::QEnableIfOlivier Goffart2011-05-191-0/+6
| | * | | Fix in-process drag-n-drop of image data, image/* was not available.David Faure2011-05-191-6/+22
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-264-3/+19
| |\ \ \ \
| | * | | | fix "Host" header of ipv6 URLs in QNAMshiroki2011-05-251-1/+11
| | * | | | uic: Use QString::fromUtf8 for QUrl properties.Friedemann Kleint2011-05-251-1/+1
| | * | | | uic: #include <QLayout> for QToolBox on non-laid-out forms.Friedemann Kleint2011-05-232-1/+7
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-2611-697/+17
| |\ \ \ \ \
| | * | | | | DeclarativeObserver: Removed the SubcomponentEditorToolThorbjørn Lindeijer2011-05-2411-697/+17
| | * | | | | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-244334-90939/+107401
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-258-76/+52
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-248-76/+52
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-05-238-76/+52
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Pass QList as const reference when possibleThorbjørn Lindeijer2011-05-173-8/+10
| | | | * | | Fixed crashes in Observer mode related to infinite bounding rectsThorbjørn Lindeijer2011-05-173-67/+38
| | | | * | | DocAaron Kennedy2011-05-161-0/+3
| | | | * | | QmlDirParser: Fix typeInfo accessor.Kai Koehne2011-05-121-1/+1
| * | | | | | Un-absented QML debugger functionv4.8.0-tp1Eckhart Koppen2011-05-221-1/+1
| * | | | | | Updating DEF files for SymbianEckhart Koppen2011-05-224-16/+45
| |/ / / / /
* | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-252-1/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-251-1/+1
| |\ \ \ \ \ \
| | * | | | | | Flickable could flick in wrong direction if given too few touch samplesMartin Jones2011-05-251-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-251-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Fix the state of default network configuration.Xizhi Zhu2011-05-241-0/+6
* | | | | | | | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-241-1/+1
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-2415-1017/+1107
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-2211-215/+215
| |\ \ \ \ \ \ \
| | * | | | | | | Absenting function in winscw def files.Laszlo Agocs2011-05-2011-215/+215
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-201-22/+44
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2