summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Fix id documentationBea Lam2010-11-301-1/+1
| * | | | Link to List Properties docs from QML Intro pageBea Lam2010-11-301-0/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-3043-311/+1410
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-11-306-13/+94
| |\ \ \ \
| | * | | | Add license to example codeBea Lam2010-11-291-0/+39
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2943-309/+1371
| | |\ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-295-13/+55
|\ \ \ \ \ \
| * | | | | | Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
| * | | | | | Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-292-2/+33
| * | | | | | Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-292-8/+20
|/ / / / / /
| * | | | | Remove expect-fails from passing testsAaron Kennedy2010-11-301-2/+0
| |/ / / /
| * | | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2941-258/+1305
| * | | | Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-292-51/+66
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-282-2/+3
|\ \ \ \
| * | | | Autotest: fix mistake in verifying pointersThiago Macieira2010-11-281-2/+2
| * | | | Remove the FIXME, it's fixedThiago Macieira2010-11-281-1/+1
| * | | | Fix warning about uninitialised varibale.Thiago Macieira2010-11-281-0/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-274-78/+76
|\ \ \ \
| * | | | Phonon: Fix use of ASCII casting in the PulseAudio support.Thiago Macieira2010-11-261-74/+72
| * | | | Phonon: Fix unused parameter warningThiago Macieira2010-11-261-1/+1
| * | | | Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
| * | | | Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2723-146/+244
|\ \ \ \