summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*Jocelyn Turcotte2010-04-1312-10/+20
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-133625-151596/+318201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-123625-151596/+318201
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-121-2/+2
| | | * | | | | | | | | | | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-121-2/+2
| | | * | | | | | | | | | | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-122-8/+14
| | | * | | | | | | | | | | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-122-9/+3
| | | * | | | | | | | | | | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-126-0/+13
| | | * | | | | | | | | | | QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-122-8/+4
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qtwebkitStaging-4.7Jocelyn Turcotte2010-04-1268-797/+1830
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-1264-1038/+1800
| | | * | | | | | | | | | | Fix failing assertions in debug buildsSimon Hausmann2010-04-093-5/+2
| | | * | | | | | | | | | | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-081-2/+2
| | | * | | | | | | | | | | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-082-8/+14
| | | * | | | | | | | | | | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-071-2/+2
| | | * | | | | | | | | | | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-072-9/+3
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-073625-151393/+317270
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | QtWebKit: Change the dependency from phonon to QtMultimedia.Jocelyn Turcotte2010-04-071-2/+2
| | | | * | | | | | | | | | | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-066-0/+13
| | | | * | | | | | | | | | | QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-062-8/+4
| | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into testMergeJocelyn Turcotte2010-04-068-2/+490
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-063624-151389/+317257
| | | | * | | | | | | | | | | | QtWebKit: Re-add the dependency to the static linked JavaScriptCoreJocelyn Turcotte2010-04-061-2/+2
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-13220-1037/+4595
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /