summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2531-102/+594
| | | | | |\
| | | | | | * Updated WebKit to 807157e42add842605ec67d9363dd3f1861748caSimon Hausmann2010-05-2531-102/+594
* | | | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-2730-152/+520
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Redraw issues when removing a fully transparent QGraphicsItem from the scene.Bjørn Erik Nilsen2010-05-261-0/+18
| * | | | | | Fixes a proxymodel sorting odity.Pierre Rossi2010-05-261-1/+1
| |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-262-2/+22
| |\ \ \ \ \
| | * | | | | QXmlStreamWriter: Auto-formatting does not behave properly with processing in...Jakub Wieczorek2010-05-261-1/+2
| | * | | | | Update the state of the keyboard modifiers on drop events.David Faure2010-05-261-1/+20
| | | |/ / / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2626-149/+479
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Doc fixes, improvementsBea Lam2010-05-261-58/+44
| | * | | | Allow js files with '.pragma library' to be used from WorkerScriptBea Lam2010-05-261-0/+1
| | * | | | Add more examples of XPath expressions to XmlRole.Bea Lam2010-05-261-10/+23
| | * | | | Open input panel on press if TextInput or TextEdit are already focused but pa...Joona Petrell2010-05-262-0/+10
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2619-58/+306
| | |\ \ \ \
| | | * | | | Fix horizontal/verticalCenter anchors bug.Yann Bodson2010-05-262-18/+18
| | | * | | | Unify naming of import plugin targetsJoona Petrell2010-05-269-12/+12
| | | * | | | Add a way to control when software input panels are shown in TextInput and Te...Joona Petrell2010-05-266-21/+273
| | | * | | | Replace QTime with QElapsedTimerAaron Kennedy2010-05-261-2/+2
| | | * | | | Fix Gradient doc snippet.Yann Bodson2010-05-261-5/+1
| | * | | | | Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".Warwick Allison2010-05-266-23/+95
| | |/ / / /
* | | | | | escape backslashesOswald Buddenhagen2010-05-264-6/+6
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2647-315/+705
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix build when snap functionality is not available.Aaron McCarthy2010-05-251-2/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2546-313/+703
| |\ \ \ \ \
| | * | | | | Dont crash when assigning the same input context twice.Denis Dzyubenko2010-05-252-4/+10
| | * | | | | Fix for Norwegian and Korean languages on symbian.Denis Dzyubenko2010-05-252-60/+62
| | * | | | | Remove unused function in QDBusConnectionPrivateThiago Macieira2010-05-252-9/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2542-240/+631
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2442-240/+631
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2442-240/+631
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2442-240/+631
| | | | | |\ \ \ \
| | | | | | * | | | fix typo in documentationAlex2010-05-241-1/+1
| | | | | | * | | | Improve Bearer Management related documentation in QNetworkAccessManagerAlex2010-05-241-0/+26
| | | | | | * | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-2419-227/+158
| | | | | | |\ \ \ \
| | | | | | * | | | | Compile with QT_NO_ACTION.Tasuku Suzuki2010-05-231-0/+2
| | | | | | * | | | | Unbreak compilation outside MacThiago Macieira2010-05-231-1/+1
| | | | | | * | | | | QDBusAbstractInterface: don't set lastError outside the object's own threadThiago Macieira2010-05-231-1/+4
| | | | | | * | | | | Remove Q_PACKED from QChar and QLocale::Data.Thiago Macieira2010-05-232-10/+2
| | | | | | * | | | | QDebug operator for QFlagsHarald Fernengel2010-05-211-0/+23
| | | | | | * | | | | Removing unneeded qDebug statement.Carlos Manuel Duclos Vergara2010-05-211-1/+0
| | | | | | * | | | | Fixing incorrect addition of public API symbols.Carlos Manuel Duclos Vergara2010-05-217-181/+55
| | | | | | * | | | | Removal erroneous inclusion of new Public API in qmacstyle.Carlos Manuel Duclos Vergara2010-05-211-0/+255
| | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2133-99/+316
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | remove dead code that will never get called.Lorn Potter2010-05-211-2/+0
| | | | | | | * | | | | add bytes and activeTime to corelwan.Lorn Potter2010-05-212-8/+102