summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' into reviews/2361Alexis Menard2010-04-143953-159806/+328683
|\
| * Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-1411-75/+360
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-141-1/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-142-6/+6
| | |\
| | * | Don't warn on signals emitted after the context has been destroyedAaron Kennedy2010-04-141-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-142-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | Doc fix.Michael Brasser2010-04-142-6/+6
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-145-6/+16
| |\ \ | | |/
| | * emit onMovementStarted/Ended/Changed on wheel eventsMartin Jones2010-04-141-0/+4
| | * Make it clear that Qt.labs modules may not remain compatible.Martin Jones2010-04-142-0/+5
| | * Complete item creation after its initial properties have been initialized.Martin Jones2010-04-141-2/+2
| | * Don't crash when columns == 0Martin Jones2010-04-141-4/+5
| * | Give better error messages on plugin load failures.Warwick Allison2010-04-142-15/+31
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-133742-152158/+319814
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-138-20/+21
| | |\
| | | * Remove warning on ASCII castThiago Macieira2010-04-131-1/+1
| | | * Fix compilation on Solaris, AIX and HP-UX.Thiago Macieira2010-04-131-5/+0
| | * | QtWebKit: Corrects symbols visibility for JavaScriptCore.Jocelyn Turcotte2010-04-131-0/+4
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-133627-151605/+318228
| | |\ \
| | | * | QtWebKit: Fix the QWebHistory serialization auto-testJocelyn Turcotte2010-04-132-9/+16
| | | * | Mark QWebFrame::overloadedSlots autotest as expected failureKent Hansen2010-04-131-0/+1
| | | * | 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-1244-579/+1328
| | | | | |\ \
| | | | | * | | 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-066-1/+461
| | | | | | |\ \ \
| | | | | | * | | | 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-13114-547/+1581
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Revert Merge Request 551. This introduces regressions to Qt.Thiago Macieira2010-04-121-3/+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-122-1/+34
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-12111-546/+1546
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | fix build from top levelOswald Buddenhagen2010-04-121-13/+6