summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0332-1113/+1119
|\
| * Update visual tests for the recent qmlviewer changeAlan Alpert2010-12-0331-1113/+1113
| * Do not use openGL on Mac OS X for QML visual testsAlan Alpert2010-12-031-0/+6
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-031-1/+1
|\ \ | |/
| * Give qmlviewer a minimum size if root object has no size.Bea Lam2010-12-031-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0390-2210/+4137
|\ \ | |/
| * Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-0330-318/+1296
| * Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| * Update QML visual testsAlan Alpert2010-12-0359-1892/+2838
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-022-48/+45
|\
| * Cleaned up sis_targets.prfMiikka Heikkinen2010-12-022-48/+45
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-024-3/+40
|\
| * Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-022-2/+33
| * Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| * Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-021-35/+35
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-011-35/+35
| |\ \
| | * | fix line endingsRobert Loehning2010-12-011-35/+35
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-021-0/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-014-30/+108
|\ \
| * | ListView header is not visible initially.Martin Jones2010-12-014-30/+108
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-011-34/+47
|\ \ \ | |_|/ |/| |
| * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-01441-7440/+29137
| |\ \
| * | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-012-2/+2
|\ \ \ \
| * | | | Fix two minor doc errorsAndy Shaw2010-12-012-2/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-013-7/+31
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Fix license header.Jason McDonald2010-12-011-5/+5
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-2/+26
| |\ \ \ |/ / / /
| * | | Change pen correctly when drawing cached textAaron Kennedy2010-12-011-0/+8
| * | | Fix BorderImage painting at sizes less than margin size.Martin Jones2010-12-011-2/+18
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-305-6/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-305-6/+21
| |\ \ \ |/ / / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-3080-556/+1791
| |\ \ \
| * | | | Fix resource leak in QEgl::getCompatibleVisualld()Rhys Weatherley2010-11-291-1/+3
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-266-5/+21
| |\ \ \ \
| | * | | | Fixed OpenGL state getting out of sync.Samuel Rødal2010-11-262-0/+12
| | * | | | Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3aFriedemann Kleint2010-11-261-1/+1
| | * | | | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-264-5/+9
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-3018-30/+253
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Ensure header is considered when positioning content with snapping.Martin Jones2010-11-305-18/+89
| * | | | Fix integer overflow in QDeclarativeItemPrivate::origin enumerationJoona Petrell2010-11-301-1/+1
| * | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-302-2/+46
| * | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-302-3/+47
| * | | | Fix Browser.qml warningsJoona Petrell2010-11-303-3/+15
| * | | | Document which header to include for qmlRegister functions.Martin Jones2010-11-303-1/+19
| * | | | Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-302-1/+31