summaryrefslogtreecommitdiffstats
path: root/demos/declarative/minehunt
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-016-12/+12
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Symbian: fix qml file paths in building of demosPasi Pentikainen2012-01-251-2/+0
| | | | | | | | | The location of included QML files in demos had changed at some point, but the symbian specific QML deployment parts were not updated to reflect the new locations, thus breaking compilation. Change-Id: Id01a685ca1de75cf73d32170b9f404c6619da7f5 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-116-6/+6
| | | | | | | | | 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
* Update qrc files.Casper van Donderen2011-11-181-16/+15
| | | | | | | The qml files were moved within the examples, the qrc files were not updated accordingly. This change fixes the problem. Reviewed-By: Daniel Molkentin
* demos/declarative/minehunt example modificationsartoka2011-11-1719-38/+51
| | | | | | | | | 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-136-102/+102
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-196-6/+6
| |\
| * | Update Minehunt demo warning messageJoona Petrell2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The message was talking about a C++ plugin when the demo is nowadays in a form of a standalone executable. Task-number: Reviewed-by: Bea Lam
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-176-6/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-106-6/+6
| |/ | | | | | | Reviewed-by: Trust Me
| * Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | | | | | | | Task: QT-4298
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-232-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-3/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-051-2/+1
| | |\
| | | * Fix minehunt.pro (minehunt is no longer a plugin)Bea Lam2010-11-051-2/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15011 Reviewed-by: Martin Jones
| | * | Don't allow flagging of flipped tiles in MinehuntAlan Alpert2010-11-051-1/+1
| | |/ | | | | | | | | | Task-number: QTBUG-4249
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| | * Make minehunt less cheerfulAlan Alpert2010-10-141-1/+3
| | | | | | | | | | | | | | | | | | An instance of failure being improperly shown as victory was rectified. Task-number: QT-3956
| * | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* | Fix deployment for examples and testsShane Kearns2010-10-121-1/+1
|/ | | | | | | | | | | Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
* Fix minehunt execution from QtDemoJoona Petrell2010-10-063-1/+22
| | | | | Task-number: QTBUG-14250 Reviewed-by: Martin Jones
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-3/+3
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Increase maximum heap size of minehunt demo to fix crashing on SymbianJoona Petrell2010-09-071-0/+1
| | | | | Task-number: QT-3821 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-263-0/+13
|\
| * Add quit buttons to declarative demosJoona Petrell2010-08-263-0/+13
| | | | | | | | | | Task-number: QTBUG-13048 Reviewed-by: Martin Jones
* | Make declarative examples a bit more qt-like.Yann Bodson2010-08-263-1/+1
|/
* Fix minehunt demo for SymbianJoona Petrell2010-08-206-145/+215
| | | | | Task-number: QTBUG-8927 Reviewed-by: Alan Alpert
* Fixed deployment locations for various profiles.axis2010-07-021-1/+1
| | | | RevBy: Trust me
* Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-221-1/+0
| | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
* Unify naming of import plugin targetsJoona Petrell2010-05-262-4/+4
| | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* Add license headers for .qml files.Jason McDonald2010-05-213-0/+123
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Emit numFlagsChangedAlan Alpert2010-05-111-0/+2
| | | | Task-number: QTBUG-10552
* Use enum rather than string for easing type.Yann Bodson2010-05-051-1/+1
|
* Add .qmlproject files for declarative demos.Yann Bodson2010-04-201-0/+16
|
* QML_DECLARE_TYPE is no longer necessary - fix docs and examplesBea Lam2010-04-191-2/+0
|
* Reduce QML runtime capabilities to NetworkServices and ReadUserDataJoona Petrell2010-04-141-1/+1
| | | | | Task-number: Reviewed-by: Martin Jones
* Minehunt cleanup/optimization.Michael Brasser2010-04-147-134/+125
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qmake.pro after Symbian alternate build system integration Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * Remove not needed permissionsThomas Zander2010-04-121-1/+0
| |
* | Text.wrap is deprecatedYann Bodson2010-04-091-16/+17
| |
* | Warn if the minehunt C++ plugin is not compiled.Yann Bodson2010-04-081-0/+7
| |
* | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-082-2/+2
| |
* | Cleanup minehunt exampleYann Bodson2010-04-071-160/+114
|/ | | | | | | Make it more touchscreen friendly Use QML coding conventions Task-number: QTBUG-9361
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-011-1/+0
|\ | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| * Remove capability flag not available in public SDKsJoona Petrell2010-04-011-2/+0
| | | | | | | | | | Task-number: QTBUG-9366 Reviewed-by: Martin Jones
* | Fix building on public symbian SDK.Thomas Zander2010-03-301-2/+2
|/ | | | | the capability CAP_GENERAL_DLL is apparently an alias, so replace it with the extended version
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-262-9/+24
|\
generated by cgit v0.12 at 2024-12-27 10:17:25 (GMT)