summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-235-0/+52
|\
| * Add a function that returns the D-Bus local machine IDThiago Macieira2011-06-233-0/+25
| * Add an SSE4.2 even simpler version of toLatin1Thiago Macieira2011-06-222-0/+27
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-239-62/+67
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-222-4/+23
| |\ \
| | * | Skip boundry neutral characters in bidi itemizationJiang Jiang2011-06-222-4/+23
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-222179-3077/+74351
| |\ \ \ | | |/ /
| | * | Merge remote branch 'qt-mainline/4.8'aavit2011-06-222179-3077/+74351
| | |\ \
| * | \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-217-58/+44
| |\ \ \ \ | | |/ / /
| | * | | Update autotest case after toHtml changeJiang Jiang2011-06-211-1/+1
| | * | | Proper fix for previous deallocation problemJiang Jiang2011-06-211-4/+2
| | * | | No need to destroy match pattern againJiang Jiang2011-06-201-1/+0
| | * | | Fix fontconfig usage in X11 font databaseJiang Jiang2011-06-202-48/+30
| | * | | Fix empty lines in Qt HTML when displayed in external browsers (again)Eskil Abrahamsen Blomfeldt2011-06-203-4/+11
| | * | | Make it possible to set color of QStaticText with pixel size >= 64Eskil Abrahamsen Blomfeldt2011-06-201-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-06-231-1/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-211-1/+0
| |\ \ \ \ \
| | * | | | | Fix autotest build failure in qdatetimeHonglei Zhang2011-06-211-1/+0
* | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-2229-355/+600
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-2229-355/+600
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-212-4/+5
| | |\ \ \ \ \ \
| | | * | | | | | Fix crash in PropertyChanges.Michael Brasser2011-06-211-2/+3
| | | * | | | | | Scroll correctly when cursorPosition is changed within onTextChanged.Andrew den Exter2011-06-201-2/+2
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-06-168-51/+294
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-106-42/+201
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixes to how resize event and layout request are posted.Jan-Arve Saether2011-06-106-42/+201
| | | * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-272-2/+74
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Fixed move a QGraphicsWidget and invalidate its layout at the same timeJohn Tapsell2011-05-272-2/+74
| | | * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-278018-132856/+156679
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Fix infinite recursion when changing geometry on MacGabriel de Dietrich2011-05-262-7/+19
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-101-2/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixing OpenGL module build error on SolarisMartin Pejcoch2011-06-101-2/+5
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-102-2/+7
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix dialog position adjustment regression in SymbianMiikka Heikkinen2011-06-101-0/+5
| | | * | | | | | | | | | SSL readbuffer 16->32 kBJaakko Koskenkorva2011-06-101-2/+2
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-092-0/+28
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Add missing freeTexture() from fix for QTBUG-19180Jani Hautakangas2011-06-092-0/+28
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-092-7/+61
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Limit the cookies count per domain to 50.Jocelyn Turcotte2011-06-092-7/+61
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-0914-291/+198
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Last word inputted was duplicated after input method hints changedSami Merila2011-06-091-0/+1
| | | * | | | | | | | | | Simplify texture pooling logic in GL graphics system.Jani Hautakangas2011-06-0913-291/+197
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-222-15/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | symbian socket engine: resolve some fixme and todo itemsShane Kearns2011-06-222-15/+23
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-223-25/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-06-223-25/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-212-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix QDeclarativeInspector when starting with ,blockAurindam Jana2011-06-212-2/+14
| | * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-211-23/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | qmlplugindump: Add -v option.Christian Kamm2011-06-211-23/+40