summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix localFont path in fonts example.Yann Bodson2010-04-151-2/+2
|
* Example fixesBea Lam2010-04-1310-83/+110
|
* Fix code style in examplesBea Lam2010-04-1358-487/+881
|
* Make demo code more consistent with example code in terms of variableBea Lam2010-04-131-1/+1
| | | | naming and code style.
* Fix score from previous changeBea Lam2010-04-131-1/+1
|
* Doc improvementsBea Lam2010-04-131-1/+1
|
* Fix example code styleBea Lam2010-04-1314-124/+206
|
* Example code style improvementsBea Lam2010-04-097-206/+195
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-091-0/+8
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0910-139/+122
| |\
| * | self-docWarwick Allison2010-04-091-0/+8
| | |
* | | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-098-14/+14
| |/ |/|
* | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-091-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit deletes the uneeded classes/declarations since we have now an inline support for QGraphicsObject based classes. QGraphicsLayout bindings works the same way because the layout property has been added to QGraphicsWidget. The only feature that is missing for now (because of the deletion of GraphicsObjectContainer) is the anchoring support. We will probably take a look on how to support this feature properly with no wrapper. Task-number:QTBUG-9456 Reviewed-by:Michael Brasser
* | Straighten board linesBea Lam2010-04-091-0/+0
| |
* | More tutorial improvmentsBea Lam2010-04-098-119/+107
|/
* Fix call to saveHighScores() and restore game timer.Bea Lam2010-04-083-6/+4
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-08121-289/+379
|\ | | | | | | | | Conflicts: examples/declarative/tutorials/samegame/samegame4/content/samegame.js
| * Fix warning in declarative/examples/velocityLeonardo Sobral Cunha2010-04-081-2/+6
| |
| * Fix samegame4 tutorial codeLeonardo Sobral Cunha2010-04-082-12/+3
| |
| * Missing fileYann Bodson2010-04-081-0/+0
| |
| * Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-088-16/+15
| |
| * Add running of examples to quality gate.Warwick Allison2010-04-082-2/+2
| | | | | | | | Fix broken examples too.
| * Improve velocity exampleYann Bodson2010-04-084-135/+84
| |
| * Missing fileAaron Kennedy2010-04-082-1/+146
| |
| * Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-08115-116/+116
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-081-0/+1
| |\
| * | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-085-8/+10
| | | | | | | | | | | | wrap remains for a little while, and will produce a warning.
* | | Improve example code - rename variables, remove redundant ids.Bea Lam2010-04-0813-156/+156
| |/ |/|
* | needs focusWarwick Allison2010-04-081-0/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-061-0/+27
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * Labs (experimental) Gesture support.Warwick Allison2010-04-061-0/+27
| | | | | | | | By popular demand.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-021-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Make s60main static lib not depend on QtCore" Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-011-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0126-74/+81
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-311-0/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | | * \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-316-327/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/WebCore.pro src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | | * | | Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbian SDK has a Time class defined which means that the compiler complains about the name already being used. Lets just disable the compile as this is not worth disturbing the example over.
* | | | | | Fix some more Q_PROPERTY followed by semi-colonThiago Macieira2010-04-025-8/+8
|/ / / / /
* | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0126-74/+81
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
| * | | | Make QML 'hello world' tutorial less confusing.Yann Bodson2010-04-013-20/+19
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9384
| * | | | Doc improvements, fixesBea Lam2010-04-0113-31/+31
| | | | |
| * | | | Fix imageprovider example compilation on Symbian armJoona Petrell2010-04-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9523 Reviewed-by: Martin Jones
| * | | | Fix plugin example compilation on Symbian armJoona Petrell2010-04-012-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9520 Reviewed-by: Martin Jones
| * | | | Renamed widgets example to proxywidgets to avoid conflictsJoona Petrell2010-04-017-11/+14
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-9518 Reviewed-by: Martin Jones
* | | | Fix build on WinCE and Symbian: .pro file must match dir name.Thiago Macieira2010-04-011-0/+0
| | | |
* | | | Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTYThiago Macieira2010-04-011-1/+1
|/ / /
* | | Minor cleanup.Yann Bodson2010-03-312-6/+5
| | |
* | | Improve flipable example.Yann Bodson2010-03-317-32/+46
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-314-26/+32
|\ \ \
| * | | Update examples/declarative.proYann Bodson2010-03-311-1/+1
| | | |