summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-11129-1034/+2369
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-10101-34/+123
| |\
| | * Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023Olivier Goffart2010-11-101-2/+2
| | * Fix warningsOlivier Goffart2010-11-101-4/+4
| | * QtCore autotests: make them paralelized.Olivier Goffart2010-11-1094-0/+99
| | * Fix crash in tst_QByteArray::qUncompressOlivier Goffart2010-11-101-0/+10
| | * Support glyph subpixel positioning without subpixel renderingJiang Jiang2010-11-105-30/+10
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-102-0/+4
| |\ \
| | * | Update the text cursor's position for input method events.Pierre Rossi2010-11-102-0/+4
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-11-101-0/+73
| |\ \ \ | | |_|/ | |/| |
| | * | QDeclarativeDebug: Add autotest for [re]setBindingForObjectKai Koehne2010-11-101-0/+73
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-107-974/+1652
| |\ \ | | |/
| | * Add more test entries for built-in JS typesKent Hansen2010-11-106-161/+822
| | * Update generated QScriptValue test filesKent Hansen2010-11-107-930/+947
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-0918-26/+517
| |\
| | * Add autotests for setting non-Object as prototype valueKent Hansen2010-11-092-0/+50
| | * Revert new flaky testKent Hansen2010-11-091-13/+0
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-0816-26/+480
| | |\
| | | * compile fix for namespaced Qthjk2010-11-082-1/+5
| | | * Ensured that the document nodes are sorted in the generated index.David Boddie2010-11-081-2/+69
| | | * Make qsTr() work with Unicode (non-Latin-1) stringsKent Hansen2010-11-089-9/+179
| | | * Add autotest that checks return value of QScriptContext::throwXXX()Kent Hansen2010-11-081-0/+49
| | | * Improve autotest coverage of QScriptEngineDebuggerKent Hansen2010-11-081-14/+93
| | | * Add benchmark for emitting signals from QtScriptKent Hansen2010-11-081-0/+28
| | | * Split monolithic QtScript autotest into smaller testsKent Hansen2010-11-081-0/+57
* | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-108-14/+42
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-096-11/+38
| |\ \ \
| | * | | Fixed deployment for symbian/linux-armcc when using shadow builds.axis2010-11-092-5/+13
| | * | | Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-095-6/+25
| | |/ /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-092-3/+4
| |\ \ \ | | |/ / | |/| |
| | * | Really fix getting qmakespec on windowsaavit2010-11-092-3/+4
| |/ /
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-0914-164/+222
|\ \ \ | |/ /
| * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-081-1/+1
| |\ \
| | * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-081-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-081-1/+1
| | | |\
| | | | * Task-number: QTBUG-15059juhvu2010-11-081-1/+1
| | | |/
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-081-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | Get the qmakespec correctly on all platformsaavit2010-11-081-1/+3
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0813-163/+219
| |\ \ \ | | |/ /
| | * | Revert "QPointer: assert when using QPointer on destroyed QObject"Olivier Goffart2010-11-081-2/+0
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0614-163/+221
| | |\ \ | |/ / /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0614-163/+221
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0514-163/+221
| | | |\ \
| | | | * | Silence warning in qvector with MSVCOlivier Goffart2010-11-051-3/+3
| | | | * | QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetS...Olivier Goffart2010-11-053-85/+106
| | | | * | QStyleSheetStyle: add a way to style the up arrowOlivier Goffart2010-11-051-0/+4
| | | | * | QPointer: assert when using QPointer on destroyed QObjectOlivier Goffart2010-11-051-0/+2
| | | | * | Add missing Q_ENUMS to QAbstractSocketOlivier Goffart2010-11-051-0/+1
| | | | * | Fix QMenu rendering in the unified toolbarFabien Freling2010-11-051-3/+8
| | | | * | Merge branch 'lancelot'aavit2010-11-057-72/+97
| | | | |\ \