summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1653-3631/+1689
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-167-38/+45
| |\
| | * Check S60_VERSION instead of existence of certain files in bearer pluginMiikka Heikkinen2010-09-162-15/+15
| | * Restore 4.7.0 behavior that non-existing paths are possible.Thomas Zander2010-09-161-2/+3
| | * Fix warningsThomas Zander2010-09-162-2/+2
| | * Fixed incorrect Symbian scoping.axis2010-09-161-2/+2
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-1625-79/+1001
| | |\
| | * | QS60style: itemview selection indication works incorrectlySami Merila2010-09-161-17/+23
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-164-73/+174
| |\ \ \
| | * | | Update QtDeclarative def filesJoona Petrell2010-09-162-1/+45
| | * | | Optimize FontLoader for "multi-use".Yann Bodson2010-09-162-72/+129
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-167-3272/+131
| |\ \ \
| | * | | Update add libconninet version 0.45.Aaron McCarthy2010-09-1634-0/+6836
| | * | | Remove libconninet in preperation to updating it to version 0.45.Aaron McCarthy2010-09-1636-9977/+0
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-161-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | doc: Fixed a \overloadThorbjørn Lindeijer2010-09-151-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-1612-167/+327
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-1511-166/+326
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-15185-5359/+8731
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-152-13/+25
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Make sure mapSelectionFromSource does not return a selection with invalid ran...Stephen Kelly2010-09-151-4/+12
| | | | | * QEventDispatcherUnix: do not process too many timer if other events need to b...Olivier Goffart2010-09-151-9/+13
| | | * | | Doc: Further QML improvements.David Boddie2010-09-151-22/+61
| | | * | | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-151-2/+2
| | | * | | Doc: Continued work on the QML documentation.David Boddie2010-09-142-18/+56
| | | * | | Doc: More work on the QML documentation.David Boddie2010-09-141-57/+59
| | | * | | Doc: More work on the declarative API documentation.David Boddie2010-09-136-54/+123
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1624-65/+989
| |\ \ \ \ \
| | * | | | | Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| | * | | | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-161-10/+30
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1522-54/+958
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-153-8/+11
| | | * | | | Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39Thomas Hartmann2010-09-152-0/+98
| | | * | | | Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-0/+2
| | | * | | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1518-54/+854
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Restore any absolute geometry changed by AnchorChanges when returningMichael Brasser2010-09-151-0/+54
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1418-54/+800
| | | | |\ \ \
| | | | | * | | Export QDeclarativeScriptActionMarco Bubke2010-09-141-1/+1
| | | | | * | | Completing the interface for children/data/resourcesThomas Hartmann2010-09-146-4/+129
| | | | | * | | This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-1411-49/+670
| * | | | | | | Fixed Q_DECLARE_METATYPE for aix-xlcRohan McGovern2010-09-161-14/+12
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Maintaining codecsData in qtextcodec_symbian.cppAlessandro Portale2010-09-151-3/+12
| |/ / / / /
* | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-151-6/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Do not wait for QThread exit when destroying global statics in SymbianMiikka Heikkinen2010-09-151-6/+29
| |/ / / /
* | | | | Doc: Listed undoable operations in QTextDocumentGeir Vattekar2010-09-151-1/+12
* | | | | Doc: Note on updating proxy models with dynamic sort filtersGeir Vattekar2010-09-151-0/+8
* | | | | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1549-303/+1780
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-151-2/+2
| |\ \ \ \ | | |/ / / | |/| | |