summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-179-183/+598
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-179-183/+598
| |\
| | * Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-171-5/+1
| | * Improve error messagesBea Lam2010-09-171-3/+3
| | * Changes to objects returned from get() should emit itemsChanged() soBea Lam2010-09-175-38/+411
| | * Make it clear that private ListModel constructor is only for workerBea Lam2010-09-174-20/+33
| | * Remove duplicated move() implementationsBea Lam2010-09-171-34/+26
| | * Doc changesBea Lam2010-09-171-4/+4
| | * Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the que...Joona Petrell2010-09-171-3/+5
| | * PathView didn't accept mouse events, preventing it from working in a Flickable.Martin Jones2010-09-172-75/+112
| | * Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-171-3/+5
| | * Fix worker agent to emit ListModel itemsChanged() correctly when set()Bea Lam2010-09-171-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-1723-37/+258
|\ \ \ | |/ / |/| |
| * | Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-172-7/+7
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1653-3631/+1689
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-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-upstream' into 4.7-docA-Team2010-09-1335-230/+610
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-113-5/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1027-31/+1100
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0989-4712/+5406
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-075-16/+26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-076-19/+48
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0739-986/+1064
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-0372-648/+2726
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-0217-28/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Clarified the comparison statement and fixed the reference to a non-existent ...Jerome Pasion2010-09-011-2/+2
| | * | | | | | | | | | | | | Clarified iterator semantic in documentation and added a code snippet to a QM...Jerome Pasion2010-08-312-2/+13
| | * | | | | | | | | | | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-3014-24/+24
| * | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into d...Morten Engvoldsen2010-08-3145-1297/+1909
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into d...Morten Engvoldsen2010-08-30185-1664/+2662
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed typo in qmath documentation.Jerome Pasion2010-08-232-3/+3
| * | | | | | | | | | | | | | | Added documentation for qmath.h header and qnumeric.h.Jerome Pasion2010-08-202-0/+190
| * | | | | | | | | | | | | | | Documented onEntry() and onExit() functions.Jerome Pasion2010-08-171-0/+3
| * | | | | | | | | | | | | | | Fixed spelling/grammar error.Jerome Pasion2010-08-161-7/+5
| * | | | | | | | | | | | | | | Merge commit 'remotes/staging/os1-4.7' into 4.7Morten Engvoldsen2010-08-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into os1-4.7Frans Englich2010-04-1766-691/+927
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Document that toUcs4 is not null-terminated.Frans Englich2010-04-171-1/+1
* | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed compilation of qdrawhelper.cpp with XLC 10Rohan McGovern2010-09-161-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Make SourceOver work properly in Qt/DirectFBAnders Bakken2010-09-161-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Removing embarrassing trialing white spaces from former commitAlessandro Portale2010-09-161-6/+6
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | 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