summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-191-1/+1
|\
| * Add Qt5 commentOlivier Goffart2010-05-191-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-1813-127/+371
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-1813-127/+371
| |\ |/ /
| * Minor improvement to QObject constructor performanceAaron Kennedy2010-05-181-23/+29
| * Test hasGuard before calling clearGuards.Olivier Goffart2010-05-182-7/+3
| * Do not clear lists in ~QObjectOlivier Goffart2010-05-181-6/+0
| * QObjectPrivate::deleteWatch, and inEventHandler are only used by jambiOlivier Goffart2010-05-183-6/+17
| * Only emit the destroyed() signal if connectedOlivier Goffart2010-05-181-15/+9
| * Benchmark for QMutex.Olivier Goffart2010-05-182-0/+137
| * Inline the common case when there is no contention.Olivier Goffart2010-05-187-67/+174
| * Optimize ~QListOlivier Goffart2010-05-181-3/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-185-34/+4
|\ \ | |/ |/|
| * Remove QT_NO_THREAD support for QHostInfoMarkus Goetz2010-05-185-34/+4
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-171-92/+103
|\ \ | |/
| * Assistant: Fix use of uninitialized address bar.ck2010-05-171-92/+103
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-147-21/+95
|\ \ | |/
| * Assistant: Enable switching between pages via an in-page combo box.ck2010-05-147-21/+95
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-125-46/+142
|\ \ | |/
| * Fix a coding style issue in a generated code in the QScriptValue tests.Jedrzej Nowacki2010-05-121-34/+48
| * Fix Mac-specific tests about the hiddenFabien Freling2010-05-121-2/+24
| * QScriptValue autotest generator modification.Jedrzej Nowacki2010-05-121-16/+25
| * Fix the hidden status check for a file onFabien Freling2010-05-112-0/+8
| * Fix for root path issue in tst_qdir. (case "drive:")Zeno Albisser2010-05-101-1/+1
| * Fix tst_qdir to use const char* instead of QString for QTest::newRowZeno Albisser2010-05-101-4/+4
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-072-4/+47
| |\ |/ /
| * Fix for qfsfileengine_win to return proper absolute path for C:\Zeno Albisser2010-05-072-4/+47
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-073-68/+186
|\ \
| * | Fix compilation of the tst_qmetaobject testOlivier Goffart2010-05-071-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-073-68/+186
| |\ \ |/ / /
| * | QObject: Optimize BlockingQueuedConnection connectionsOlivier Goffart2010-05-071-30/+23
| * | QMetaObject::invokeMethod using Qt::BlockingQueuedConnection can handle the r...Olivier Goffart2010-05-073-38/+163
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-071-3/+4
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-061-3/+4
| |\ \ |/ / /
| * | Fix tst_qaccessibility::accelerators on MacMorten Johan Sørvig2010-05-061-3/+4
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-05-05188-2280/+6984
|\ \ \ | |_|/ |/| |
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-05-04188-2280/+6984
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-049-168/+315
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+315
| | | |\ \
| | | | * | Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
| | | | |\ \
| | | | | * | Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0359-367/+1959
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-0312-89/+215
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0358-364/+1950
| | | | |\ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | | * | | | QGraphicsView drawing artifacts due to rounding errors.Bjørn Erik Nilsen2010-05-036-80/+194
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-036-9/+21
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Fix a small typo: therfore -> thereforeLaszlo Papp2010-05-031-1/+1
| | | * | | | | Fix a small typo in setColor description (brush -> color)Laszlo Papp2010-05-031-1/+1
| | | * | | | | only add phonon and scripttools dependencies if they're available, otherwise ...Romain Pokrzywka2010-05-031-3/+7