summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* State doc fixes, improvementsBea Lam2010-08-025-82/+227
* Correctly apply PropertyChanges when entering an extended stateMichael Brasser2010-08-023-1/+45
* Update QtGui def filesJoona Petrell2010-08-022-0/+6
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-02146-665/+1856
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3159-760/+1932
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3059-760/+1932
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3059-760/+1932
| | | |\
| | | | * Add missing imageBea Lam2010-07-302-1/+1
| | | | * Mention scope of id uniquenessBea Lam2010-07-302-1/+10
| | | | * Update QML Documents exampleBea Lam2010-07-303-26/+98
| | | | * add license headerHarald Fernengel2010-07-291-0/+41
| | | | * doc: Add a note about QCoreApplication::applicationDirPathHarald Fernengel2010-07-291-0/+3
| | | | * Add license headerHarald Fernengel2010-07-291-0/+41
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2953-732/+1738
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-29124-616/+14782
| | | | | |\
| | | | | * | Improve utility of QMLViewerAaron Kennedy2010-07-2924-193/+679
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-316-256/+322
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-306-256/+322
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Fixed a broken def file entry.axis2010-07-302-2/+2
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-294-254/+320
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fixed key event handling on Symbian.axis2010-07-292-55/+118
| | | * | | | Cleaned up old comments.axis2010-07-291-12/+0
| | | * | | | Refactored the virtual mouse handling code into its own function.axis2010-07-292-171/+181
| | | * | | | Removed static on a member that didn't have to be.axis2010-07-292-5/+8
| | | * | | | Fixed a problem with dso dependencies.axis2010-07-291-19/+21
| | | |/ / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-3023-65/+393
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-3023-65/+393
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-07-2923-65/+393
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-3020-14/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixed the incorrect diagram for bug QTBUG-12385.Jerome Pasion2010-07-3018-0/+0
| | * | | | | QFileDialog crashes when empty selectedFilter is set on Carbon.Prasanth Ullattil2010-07-301-3/+5
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-301-11/+13
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Fix crash on Desktop platforms.Aaron McCarthy2010-07-291-11/+13
| | |/ / / /
| * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-299-9/+91
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-299-9/+91
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-299-9/+91
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-284-20/+47
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-274-20/+47
| | | | | |\ \ \
| | | | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-07-274-20/+47
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-07-272-1/+57
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-07-272-1/+57
| | | | | |\ \ \ \ | | | | |/ / / / /
| | | | | * | | | Fix crash when all the items in a QListView are hiddenGabriel de Dietrich2010-07-272-1/+57
| | | | | |/ / /
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-271-1/+4
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Workaround for QTBUG-8013: Do not return an ascent of 0Alessandro Portale2010-07-271-1/+4
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-262-3/+5
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Removed QEXPECT_FAIL macros from test cases which now passGareth Stockwell2010-07-261-3/+1
| | | | | * | | Ensure backing store is deleted before top-level windowGareth Stockwell2010-07-261-0/+4
| | | | |/ / /
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-224-4/+4
| | | | |\ \ \
| | | | | * | | One more .pro fix for deprecated INCPATHMarkus Goetz2010-07-221-1/+1
| | | | | * | | Fix Rhys' qmake warningsMarkus Goetz2010-07-223-3/+3
| | | | |/ / /