summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0571-956/+1337
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0571-956/+1337
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0571-956/+1337
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-05344-9538/+7674
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-051-26/+12
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | Set correct license header.Jason McDonald2010-07-051-26/+12
| | | | | | | * | | | | | Prepare for QTest persistent store for visual tests.Warwick Allison2010-07-051-22/+22
| | | | | | | * | | | | | Loosen font-sensitive test.Warwick Allison2010-07-051-1/+2
| | | | | | | |/ / / / /
| | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-052-3/+44
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | <br/> shouldn't trigger a new format range in QDeclarativeStyledText.Michael Brasser2010-07-051-1/+3
| | | | | | | | * | | | | Add styled text layout benchmark.Michael Brasser2010-07-051-0/+41
| | | | | | | | * | | | | Optimize QDeclarativeStyledText.Michael Brasser2010-07-051-2/+0
| | | | | | | * | | | | | Work around QTBUG-11929Warwick Allison2010-07-051-1/+2
| | | | | | | |/ / / / /
| | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0456-174/+329
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0356-174/+329
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0356-174/+329
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | Don't write to the logger widget while the application is closing down.Robert Griebl2010-07-021-1/+1
| | | | | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0255-173/+328
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-022-0/+8
| | | | | | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-021-14/+24
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | * | | | docs - fix doc links, minor improvementsBea Lam2010-07-021-14/+24
| | | | | | | | | | | * | | | | Fix test for N900 (ARM-specific SVG results).Warwick Allison2010-07-024-8/+6
| | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-0237-299/+380
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * | | | Fix TextEdit bitmap tests testing the wrong elementJoona Petrell2010-07-022-4/+4
| | | | | | | | | | | | * | | | Fix TextInput text getting improperly clippedJoona Petrell2010-07-029-22/+110
| | | | | | | | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-02153-8569/+5927
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | * | | | fix doc linksBea Lam2010-07-0210-11/+12
| | | | | | | | | | | | | * | | | Fix docs to link to the new QML Viewer page instead of the Runtime pageBea Lam2010-07-0211-29/+45
| | | | | | | | | | | | * | | | | qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-021-42/+62
| | | | | | | | | | | * | | | | | Make autotests work with qreal == float (in addition to double).Warwick Allison2010-07-0216-51/+58
| | | | | | | | | | | * | | | | | Don't accept *files* that exist when *directory* is required.Warwick Allison2010-07-024-2/+9
| | | | | | * | | | | | | | | | | Make declarative pixmap cache easier to useAaron Kennedy2010-07-0512-733/+930
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-1059-160/+979
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-1059-160/+979
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2Simon Hausmann2010-07-0959-160/+979
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-1022-72/+3356
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Linux runonphone - tell the user which driver to loadShane Kearns2010-07-091-6/+45
| * | | | | | | | | | | | | | | | | Fix USB serial port detection of the Nokia N95 on linuxShane Kearns2010-07-094-9/+59
| * | | | | | | | | | | | | | | | | Fix license headers on new files imported from Qt CreatorShane Kearns2010-07-096-84/+156
| * | | | | | | | | | | | | | | | | Implement just in time debug feature for runonphoneShane Kearns2010-07-083-3/+186
| * | | | | | | | | | | | | | | | | Merge tools/runonphone/symbianutils from qtcreator src/shared/symbianutilsShane Kearns2010-07-0813-54/+2980
| * | | | | | | | | | | | | | | | | Add exception barrier to QCertificateRetriever::RunL()Shane Kearns2010-07-082-3/+9
| * | | | | | | | | | | | | | | | | Set QThreads to be process critical automatically on Symbian OSShane Kearns2010-07-081-0/+8
* | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge commit 'v4.7.0-beta2' into 4.7Jason McDonald2010-07-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fixed a broken merge.v4.7.0-beta2Denis Dzyubenko2010-06-302-66/+0
| | | * | | | | | | | | | | | | | | Changed the way we detect touch screen on Windows.Denis Dzyubenko2010-06-302-32/+36
| | | * | | | | | | | | | | | | | | Fix s60main linking issue with gcce applicationsMiikka Heikkinen2010-06-301-0/+4
| | | * | | | | | | | | | | | | | | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-304-0/+30