summaryrefslogtreecommitdiffstats
path: root/demos/declarative/samegame
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-115-5/+5
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-221-1/+2
| | | | Rubberstamped-by: Oswald Buddenhagen
* Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-211-1/+2
| | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
* demos/declarative/samegame example modificationsartoka2011-11-1727-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-134-68/+68
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-175-14/+15
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-045-14/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| | * Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-285-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
* | | Only ask for name when the user goes on the high score list.Alan Alpert2011-02-041-5/+36
|/ / | | | | | | Task-number: QTBUG-14714
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-174-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-104-4/+4
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-3/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Fix samegame text input focusAlan Alpert2010-11-051-3/+1
| | | | | | | | | | | | | | The real problem is QTBUG-15047, but by implementing SameGame in a different way it gets worked around very nicely. Task-number: QTBUG-14716
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-301-90/+108
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
| * samegame: white spacehjk2010-10-281-90/+108
| | | | | | | | Reviewed-by: Kai Koehne
* | Making the buttons less finger unfriendlyAlessandro Portale2010-10-282-3/+4
|/ | | | | I did not dare to apply the same fix to the samegame tutorials, since those are completely diverged from the demo.
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-294-4/+4
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Maintain high score name dialog length, as well as name.Alan Alpert2010-08-262-1/+3
| | | | Task-number: QTBUG-13129
* Fix SamegameAlan Alpert2010-07-191-2/+2
| | | | | | | Change to Behavior from Follow means that some of the previous assumptions are now incorrect. Script logic has been fixed. Task-number: QTBUG-12246
* Follow -> Behaviormae2010-07-082-8/+10
| | | | Replace the usages of Follows with Behaviors, update docs.
* Fix bug in SameGame's dialog componentAlan Alpert2010-07-012-1/+3
| | | | | | Was emitting closed after already being closed. Task-number: QTBUG-11812
* Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-211-0/+2
| | | | | | | If I missed any, just set inAnotherDemo to true on the SameGame root item. Task-number: QTBUG-11562
* Minor demo fixesAlan Alpert2010-06-161-0/+2
| | | | Found some minor demo issues while testing a TextInput change.
* Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-032-6/+19
| | | | | Task-number: QTBUG-11157 Reviewed-by: Warwick Allison
* Add license headers for .qml files.Jason McDonald2010-05-214-0/+164
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-201-2/+2
| | | | QDeclarativeComponent)
* Make component.createObject require a parent argumentAlan Alpert2010-05-051-2/+1
| | | | | | | | | For graphical objects (the common case) a common mistake is to not parent a dynamically created item. Since you almost always want to add a parent, and it's hard for a beginner to diagnose this problem, a parent is now a required argument and dealt with by the createObject function. Task-number: QTBUG-10110
* Remove Component's isReady, isLoading, isError and isNull properties.Bea Lam2010-04-291-1/+1
| | | | | | | The Component status enum covers all of these properties already and removing these also makes the API consistent with Image and Loader. Note this change only affects the QML Component API; the methods are still available for QDeclarativeComponent.
* Replace usage of print() with console.log().Michael Brasser2010-04-231-5/+4
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-211-0/+16
|\
| * Add .qmlproject files for declarative demos.Yann Bodson2010-04-201-0/+16
| |
* | Make the dynamic creation functions on the Qt objectAlan Alpert2010-04-211-1/+1
|/ | | | | | | | | Also updated examples to still work, and the dynamic example now uses exceptions a little, to demonstrate that it can be done. Exceptions are also now filled out with the QML error data. Task-number: QT-2801 Reviewed-by: Aaron Kennedy
* Indentation and whitespace fixes in qml's samegame tutorialLeonardo Sobral Cunha2010-04-194-8/+10
|
* Make demo code more consistent with example code in terms of variableBea Lam2010-04-135-142/+174
| | | | naming and code style.
* Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-081-2/+2
|
* Add running of examples to quality gate.Warwick Allison2010-04-081-1/+1
| | | | Fix broken examples too.
* Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-084-4/+4
|
* Tweak import behaviourAlan Alpert2010-03-251-1/+1
| | | | | | | | | | | | | The implicit import of types in the same directory/module now imports version -1 (which means all versions). This fixes the Twitter demo. Additionally, the current directory is not added to the imports path. No functionality is lost, as you can import local modules with relative paths for the same effect. Improved docs are on the way. Reviewed-by: mae
* Deprecate inline Script {} blocksAaron Kennedy2010-03-222-13/+7
| | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
* Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-111-0/+1
| | | | Task-number: QT-2846
* Use no-version-specified to mean any version (used to work, fixed again,Warwick Allison2010-03-101-3/+3
| | | | was only working with -1.-1 which looks silly)
* Fix Samegame.Michael Brasser2010-03-031-1/+1
|
* Refactor demosAlan Alpert2010-03-0215-3/+3
| | | | Samegame and Twitter are now trying the new naming convention.
* Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-023-5/+5
| | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
* Rename MouseRegion -> MouseAreaMartin Jones2010-02-223-3/+3
|
* Fix palette on the N900Harald Fernengel2010-02-161-1/+1
| | | | | | | | The N900 has by default black background with white text, but white line edits with black text. Use windowText for the "Score" label to make it readable. Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix SameGame high scoresAlan Alpert2010-02-151-2/+3
| | | | | When it's deployed across multiple devices, there is no 'standard' grid size. This allows non-desktop versions to display high scores.
* Enhance samegame high score dialogAlan Alpert2010-02-153-3/+18
| | | | | 'Better' layout mechanics, included animated resize for those people with long names.
* Remove samegame README (mentioned images have been replaced)Kai Koehne2010-01-221-10/+0
|
* Tweak marble graphics in SamegameNigel Hietala2010-01-224-0/+0
|
generated by cgit v0.12 at 2025-01-10 14:08:53 (GMT)