summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-1548-2937/+7812
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-110-0/+0
| |\
| | * Revert accidental commitBea Lam2011-08-111-205/+91
| | * Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-082-2/+2
| |\ \
| | * | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-082-2/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-059-13/+37
| |\ \ \ | | |/ /
| | * | Fix compile errors on S60 3.2Shane Kearns2011-08-057-12/+16
| | * | Fix to QGLWidget rendering with VG graphics systemJani Hautakangas2011-08-052-1/+21
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-041-1/+1
| |\ \ \ | | |/ /
| | * | Symbian/gcce: Remove the useless -T flagMartin Storsjo2011-08-041-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-042-4/+4
| |\ \ \ | | |/ /
| | * | Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
| | * | Fix fancybrowser.proShane Kearns2011-08-041-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-042-4/+25
| |\ \ \ | | | |/ | | |/|
| | * | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-042-4/+25
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-08-03127-52415/+26133
| |\ \ \
| | * | | Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| | * | | Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| | * | | Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-031-1/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-121-13/+15
|\ \ \ \ \
| * | | | | Always disconnect signals on aborted reply objectsBea Lam2011-08-121-13/+15
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-1241-179/+182
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1116655-1088194/+2268376
| |\ \ \ \ \
| * | | | | | QmlInspector: Fix moc errorKai Koehne2011-08-111-1/+0
| * | | | | | QmlInspector: Fix compile for QT_NO_CURSORKai Koehne2011-08-103-0/+6
| * | | | | | QmlInspector: Remove unused toolbarKai Koehne2011-08-1026-136/+2
| * | | | | | JSDebugger: Only hit breakpoints in user codeKai Koehne2011-08-101-18/+15
| * | | | | | Prevent Binding from crashing when its target object is deleted.Michael Brasser2011-08-033-1/+43
| * | | | | | Cleanup QMLViewer properly when exiting via File->Quit.Michael Brasser2011-07-261-0/+1
| * | | | | | Fix crash when assigning a list property to transitions.Michael Brasser2011-07-263-1/+59
| * | | | | | Qml Debugging: only read properties that can be displayed in the debuggerChristiaan Janssen2011-07-202-7/+8
| * | | | | | qmldump: Fix creation of objects from QDeclarativeTypes.Christian Kamm2011-07-141-14/+23
| * | | | | | Document state fast-forwarding.Michael Brasser2011-07-071-0/+22
| * | | | | | qmlplugindump: Update qmltypes file format documentation.Christian Kamm2011-07-051-2/+4
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-114-48/+74
|\ \ \ \ \ \ \
| * | | | | | | Avoid spurious detaching in QDir::to/fromNativeSeparatorsJoão Abecasis2011-08-111-10/+28
| * | | | | | | Use fromLocal8Bit for reversing toLocal8BitJoão Abecasis2011-08-111-1/+1
| * | | | | | | Don't convert template's path separators againJoão Abecasis2011-08-111-1/+1
| * | | | | | | Changed if/if/else/if/eleven chain to switchJoão Abecasis2011-08-111-15/+22
| * | | | | | | Modulus of negative dividends is undefined or negativeJoão Abecasis2011-08-111-1/+1
| * | | | | | | Fix warning when compiling with VS 2008João Abecasis2011-08-111-2/+2
| * | | | | | | Re-introduce Q_GLOBAL_STATIC_INITJoão Abecasis2011-08-111-18/+19
|/ / / / / / /
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-111-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-stagingAlan Alpert2011-08-111-20/+11
| |\ \ \ \ \ \
| * | | | | | | Don't leak MouseEventsAlan Alpert2011-08-111-2/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-1113-241/+463
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix race condition in processJobs()Bea Lam2011-08-111-20/+11
| |/ / / / / /