summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Skip test for cocoa: setToolTipMorten Johan Sørvig2010-04-131-0/+3
* Replaced qWarning with QCOMPARE/QVERIFY statements in tst_QFileInfoZeno Albisser2010-04-131-28/+14
* Assistant: Handle forward/backward mouse buttons on press on Linux.ck2010-04-135-16/+58
* Don't test DBus BIC if QT_NO_DBUS is defined.Morten Johan Sørvig2010-04-131-0/+2
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-131-11/+7
|\
| * Removed broken tests from tst_QFileInfo::isSymlink_data()Zeno Albisser2010-04-131-11/+7
* | qdoc: Fixed some TOC links.Martin Smith2010-04-131-1/+0
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-13587-4155/+10944
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-13211-962/+4439
| |\
| | * Revert Merge Request 551. This introduces regressions to Qt.Thiago Macieira2010-04-122-59/+4
| | * Fixed scroll area size calculation on Mac.Erik Verbruggen2010-04-121-4/+4
| | * Fix a race where QThread::exit() is "lost" when called after start()Bradley T. Hughes2010-04-123-12/+70
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-12208-950/+4424
| | |\
| | | * make a partial build of linguist in no-gui configOswald Buddenhagen2010-04-122-2/+3
| | | * make the code less of a trapOswald Buddenhagen2010-04-121-15/+19
| | | * fix build from top levelOswald Buddenhagen2010-04-121-13/+6
| | | * Partially revert MR 543 changes to Linguist.Thiago Macieira2010-04-122-3/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-13546-3876/+10448
| |\ \ \
| | * | | doc fixesYann Bodson2010-04-121-5/+15
| | * | | Don't test XmlListModel examples on platforms without QtXmlPatternsAlan Alpert2010-04-121-0/+6
| | * | | More error output for QML_IMPORT_TRACE=1mae2010-04-121-0/+9
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12546-3871/+10418
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-123-2/+3
| | | |\ \
| | | | * | Fix declarative examples autotest, avoid using native separatorsLeonardo Sobral Cunha2010-04-121-2/+2
| | | | * | Doc: update Rectangle smooth painting screenshot.Yann Bodson2010-04-122-0/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-12606-4494/+7579
| | | |\ \ \ | | | | |/ /
| | | | * | Remove GraphicsObjectContainer from the documentation.Yann Bodson2010-04-121-1/+0
| | | | * | import Qt 4.6 -> import Qt 4.7Yann Bodson2010-04-1222-22/+22
| | | | * | Move documentation code to snippet.Yann Bodson2010-04-122-41/+39
| | | | * | Test fix.Michael Brasser2010-04-121-2/+2
| | | | * | Fix testBea Lam2010-04-121-1/+3
| | | | * | Fix test on QWS.Michael Brasser2010-04-121-0/+4
| | | | * | Fix PathView crash.Michael Brasser2010-04-121-1/+1
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1236-677/+1790
| | | | |\ \
| | | | | * | Improve font value type documentation.Yann Bodson2010-04-123-5/+316
| | | | | * | coding conventionsYann Bodson2010-04-121-16/+14
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-1242-672/+1749
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12505-3538/+5185
| | | | | | |\ \
| | | | | * | | | Doc fixesBea Lam2010-04-124-20/+32
| | | | * | | | | Make bindings dump more usefulAaron Kennedy2010-04-121-46/+69
| | | | | |_|/ / | | | | |/| | |
| | | | * | | | WarningAaron Kennedy2010-04-121-1/+1
| | | | * | | | Read Maemo orientation at startupAaron Kennedy2010-04-121-8/+5
| | | | * | | | Exclude gestures from examples autotestAaron Kennedy2010-04-121-0/+1
| | | | * | | | Exclude proxywidgets from examples autotestAaron Kennedy2010-04-121-0/+1
| | | | * | | | Fix crash on QScriptProgram destructionAaron Kennedy2010-04-121-0/+4
| | | | * | | | doc fixesYann Bodson2010-04-122-3/+3
| | | | * | | | Start documenting coding conventionsYann Bodson2010-04-129-40/+308
| | | | * | | | Adds missing qml file to qdeclarativeflipable autotestLeonardo Sobral Cunha2010-04-122-0/+14
| | | | |/ / /
| | | | * | | Revert "Better reporting of extension plugin loading errors."Aaron Kennedy2010-04-121-23/+7
| | | | * | | DocAaron Kennedy2010-04-121-2/+2