summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added QML coding convention for "private" properties.Jerome Pasion2010-12-062-3/+64
* Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-062-15/+24
* Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
* Fixed a bug by changing the id name to lower case.Jerome Pasion2010-12-061-1/+1
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-03108-2594/+4587
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-035-28/+81
| |\
| | * rebuild configureOswald Buddenhagen2010-12-031-0/+0
| | * fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| | * Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| | * Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| | * VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| | * Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| | * Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | * build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
| | * purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-032-12/+19
| |\ \ | | |/ | |/|
| | * Unify epocroot usage in createpackage and patch_capabilities scriptsMiikka Heikkinen2010-12-032-12/+19
| * | 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-upstream' into 4.7-docA-Team2010-12-026-51/+87
|\ \ | |/
| * 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-upstream' into 4.7-docA-Team2010-12-0115-79/+209
|\ \ \ | |/ /
| * | 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
| | |\ \ \ | |/ / / /