summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0111-55/+121
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-12/+26
| |\
| | * ListView header is not visible initially.Martin Jones2010-12-012-12/+26
| * | 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-01141-1044/+2288
| | |\ \
| | * | | 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-011-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix two minor doc errorsAndy Shaw2010-12-011-1/+1
| | | |/ | | |/|
| * | | 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/qt into 4.7Joona Petrell2010-11-3044-523/+867
| | |\ \
| | * | | 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-upstream' into 4.7-docA-Team2010-11-3025-332/+659
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Ensure header is considered when positioning content with snapping.Martin Jones2010-11-302-17/+26
| * | | | | Fix integer overflow in QDeclarativeItemPrivate::origin enumerationJoona Petrell2010-11-301-1/+1
| * | | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-301-2/+9
| * | | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| * | | | | Fix Browser.qml warningsJoona Petrell2010-11-301-1/+1
| * | | | | Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-301-1/+1
| | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2918-307/+620
| |\ \ \ \
| | * | | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2917-256/+599
| | * | | | Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-51/+21
* | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-291-3/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
| |/ / / /
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-281-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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-upstream' into 4.7-docA-Team2010-11-2725-213/+246
|\ \ \ \ \ | |/ / / /
| * | | | 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-2718-130/+165
| |\ \ \ \
| | * | | | Fix strict-aliasing violation warning.Thiago Macieira2010-11-261-1/+9
| | * | | | Fix warning about %x parameter type mismatch in EGLThiago Macieira2010-11-261-1/+1
| | * | | | Fix warning about address of a function being constant.Thiago Macieira2010-11-261-0/+4
| | * | | | Fix warnings related to unused variables.Thiago Macieira2010-11-267-5/+8
| | * | | | Fix silly "will be initialised after" warning.Thiago Macieira2010-11-261-1/+1
| | * | | | Fix warning about mixing integral with non-integral type in ?:Thiago Macieira2010-11-261-2/+2
| | * | | | Fix warning about use of uninitialised variableThiago Macieira2010-11-261-1/+1
| | * | | | Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| | * | | | Fix warnings with GCC 4.5: some cases are not part of the enumThiago Macieira2010-11-261-2/+2