summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Fix namespace compilation.Sarah Smith2012-02-0112-11/+36
| | | | | | | | | | | Back-ported from Qt5 changes: 24b1b6bd5c6a3960cfdf71cc644d95926430c267 d641f03b6efecce266ef329eb4bbc48d87c2fc12 2734491c7230bfa54af46ef56085a56e61eed8a0 f037bb1fa72b7dee790367776a913b18a07445ac Change-Id: I73e2e8996376ea40b9763224554aafba7fe7bdb6 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fixing harmattan pkgsSarah Smith2011-12-0126-27/+36
| | | | | | | | | | | | | | | | | The fixes are going into the qtc_harmattan packaging scripts, since the scratchbox for harmattan seems to be no longer working. Eventually we should remove it and put the qtc_harmattan one in instead, but for now keep both around until its proven to work. This is also important because bifh might need it. Basically - remove the translation line, fix up a lot of broken desktop files, use a different location for the icons, and generally fix all the problems as described in the bug. Task-number: QTBUG-21955 Change-Id: I02cdf6c02ef9515b14384aaaf8e039a09a6cb82b Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Begin removing N900 support.Sarah Smith2011-11-269-126/+0
| | | | | | | | These desktop files are a pain to maintain and we now must begin to deprecate N900 support, by removing them. Change-Id: If53ed68079b11057aed6c6588ed2b9865c67e38b Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Remove the translation line.Sarah Smith2011-11-269-9/+0
| | | | | | | | | Problems with display on the launcher grid are attributed to the translation line being there when there is no translation supplied. In any case its not helping so remove it. Change-Id: I7e537214f878023dfde81ce0f76320f825b4eeed Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Squash a few warnings.Sarah Smith2011-10-271-1/+0
| | | | | Change-Id: I79846317dfc852881d73f8dfe5d9e2a5aa76db2b Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Make the flickr3d demo bit more worthy.Sarah Smith2011-10-0913-78/+135
| | | | | | | | | | Steal some code from the flickr demo in declarative to make this one actually dynamically fetch some images. Change-Id: I84b4b7b31787e4d27c4aee642d6c37ebf3f90264 Reviewed-on: http://codereview.qt-project.org/6228 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Icons updated for all platforms.Danny Pope2011-09-2717-0/+0
| | | | | | | Change-Id: I33d5bdd08e607795908a4cabae361866243c170c Reviewed-on: http://codereview.qt-project.org/4835 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Revert "Merge branch 'refactor'"Julian de Bhal2011-09-155-5/+5
| | | | | | | | | | This reverts commit 6d4888bab754e3dd439599ed53c2a3ae900760e9, reversing changes made to 1427884ac16febb8ee12d240236fb4f223902aea. Change-Id: I3fc9981f8c76a36feeaba6e83bcffdea03fd09fd Reviewed-on: http://codereview.qt-project.org/4930 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-135-5/+5
|\ | | | | | | | | Conflicts: demos/quick3d/robo_bounce/main.cpp
| * compile with refactorGunnar Sletta2011-09-025-5/+5
| |
* | Fixes to icons to resemble standard symbian anna icons.Danny Pope2011-09-132-13/+46
| | | | | | | | | | | | | | Change-Id: I8cfc3cd2d4225ff9ea04f62b2820f0ee4cd53504 Reviewed-on: http://codereview.qt-project.org/4721 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | QTBUG fixes for 21303,21239,21241,21300, 21301, 21240Danny Pope2011-09-124-6/+20
| | | | | | | | | | | | | | Change-Id: I442601ab160fdd47119628cba3ce93869ab1ec40 Reviewed-on: http://codereview.qt-project.org/4619 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* | Fix missing/outdated license headersJason McDonald2011-09-091-18/+18
| | | | | | | | | | | | Change-Id: I60ba4aae4e477a733a8189081b13ca40f8faa7c4 Reviewed-on: http://codereview.qt-project.org/4316 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* | QTBUG-21303 Teaservice not rendering immediately on Symbian.Danny Pope2011-09-071-0/+2
|/ | | | | | | Change-Id: I0138b70ff3399a1ff5e153eb731bcd9df64dd69c Reviewed-on: http://codereview.qt.nokia.com/4304 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Fix missing/outdated liccense headers.Jason McDonald2011-08-192-38/+38
| | | | | | Change-Id: I0f518965e0c97516dc0bba14a438b8d0dac2d9ce Reviewed-on: http://codereview.qt.nokia.com/2759 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Put the skybox stuff into QML3D.Sarah Smith2011-08-1920-1/+245
| | | | | | | | | | | | | | | | This skybox functionality was originally written for the photobrowser3d demo. Begin creating a flick3d demo which will eventually replace the photobrowser3d using the network aware url support for textures, and the 3d data models recently implemented. At present all the flickr3d demo does is to display a textured cube inside a skybox. Change-Id: I1d8bbb4a8853b1e39de96d9eab220b198df31707 Reviewed-on: http://codereview.qt.nokia.com/2921 Reviewed-by: Patrick Burke <patrick.burke@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3249 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Replace outdated license headers.Jason McDonald2011-08-0559-1077/+1067
| | | | | | | Change-Id: I2f76b03a454cef0ad568c9265b568e5e837affd2 Reviewed-on: http://codereview.qt.nokia.com/2610 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Multiple fixes to build system.Patrick Burke2011-08-028-45/+12
| | | | | | | | | | | | Fixed harmattan build issues with lack of CONFIG += package flag. Fixed harmattan lack-of-icons bug. Fixed multiple inclusions of pkg.pri. Fixed multiple inclusions of symbian icons. Change-Id: I6dfb925efa13af39d3a7fbc651743fbd551f840d Reviewed-on: http://codereview.qt.nokia.com/2315 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Final major change to cleanup build system.Patrick Burke2011-07-282-0/+6
| | | | | | | | | | | Should eliminate problems where the "qml" directories aren't being updated upon rebuilds, and allows easier deployment to devices via Qt Creator. Change-Id: I5323ba460bbad395f82341da560e75d35288fea3 Reviewed-on: http://codereview.qt.nokia.com/2247 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Tidying up build system removing need for qt3d_pkg_dep.pri.Patrick Burke2011-07-275-5/+5
| | | | | | | Change-Id: Ie30bc5e6caa065ba4ef00903f6e468e8c4260715 Reviewed-on: http://codereview.qt.nokia.com/2232 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Tidying up build system removing need for qt3dquick_pkg_dep.pri.Patrick Burke2011-07-278-5/+9
| | | | | | Change-Id: I97f8cdccecbf015a60f09a85f5e55ecd3f778377 Reviewed-on: http://codereview.qt.nokia.com/2230 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Tidying up build system removing need for qml_pkg.pri.Patrick Burke2011-07-272-2/+4
| | | | | | Change-Id: Ief07b4656cb676ea74ec389154ffd07dfde50abd Reviewed-on: http://codereview.qt.nokia.com/2229 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* More deployment updates.Patrick Burke2011-07-211-1/+4
| | | | | | | Change-Id: I471f5f8c6301a1d694060a76108894d1a4aea922 Reviewed-on: http://codereview.qt.nokia.com/1912 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Deployment updates.Patrick Burke2011-07-201-0/+4
| | | | | | | Change-Id: I18912a5667dd13a11e74b0dcd7f27833a301f764 Reviewed-on: http://codereview.qt.nokia.com/1856 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Core changes to make Symbian work with the new repo/packaging rules.Danny Pope2011-07-151-1/+1
| | | | | | | Change-Id: Ib5bdfa930d3f05324e23a93d47a4e2e389bcbee9 Reviewed-on: http://codereview.qt.nokia.com/1683 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Updating all qml files to standardize on "import QtQuick 1.0".Patrick Burke2011-07-128-8/+8
| | | | | | Change-Id: If09c645392d34b4174c85462679dbe535fb5b521 Reviewed-on: http://codereview.qt.nokia.com/1476 Reviewed-by: Sarah Jane Smith
* Fixed building issues.Patrick Burke2011-07-081-3/+7
| | | | | | | | | | | | | | | | Qt5 checks in all qmlres.h files. Removed duplicate += qtquick3d's in pro files. Updated manual test to use DeclarativeView3D's. Updated the qmlres.h files for demos/tutorials/tests to point to the resources/examples directory where all the qml files are stored, rather then resources/demos, resouces/tutorials, resources/tests, which don't exist. Change-Id: I5e8c99e22cf1bf6aace8fd595e42c8beb736d823 Reviewed-on: http://codereview.qt.nokia.com/1338 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* QTBUG-19427 Finalised. QML/3D working on Symbian.Patrick Burke2011-07-083-4/+13
| | | | | | | | | | Original patch by Danny Pope, just needed to be reworked for new build setup. Change-Id: I9c0ed84f18fe98a5b8b72f9531ba7fd0fa7f2e31 Reviewed-on: http://codereview.qt.nokia.com/1103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Fix up misc symbian vs qtc clashes.Sarah Smith2011-07-0610-278/+27
| | | | | | | | | | | Conflicts: examples/quick3d/photoroom/main.cpp pkg.pri Change-Id: I01238e324968f30c0a85177fa9db84e8d0d69ed4 Reviewed-on: http://codereview.qt.nokia.com/1124 Reviewed-by: Sarah Jane Smith
* Symbian icons.Danny Pope2011-07-062-0/+273
| | | | | | | Change-Id: I3784274d27d034ad2e3f2278dc9c1f29b9a6b3b4 Reviewed-on: http://codereview.qt.nokia.com/1102 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Various symbian fixesSarah Smith2011-07-0613-14/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/quick3d/model_viewer/model_viewer.pro demos/quick3d/robo_bounce/robo_bounce.pro demos/quick3d/tea_service/tea_service.pro examples/qt3d/basket/basket.pro examples/qt3d/builder/builder.pro examples/quick3d/basket/basket.pro examples/quick3d/cube/cube.pro examples/quick3d/forest/forest.pro examples/quick3d/lander/lander.pro examples/quick3d/matrix_animation/matrix_animation.pro examples/quick3d/monkeygod/monkeygod.pro examples/quick3d/moon/moon.pro examples/quick3d/photoroom/photoroom.pro examples/quick3d/shaders/shaders.pro examples/quick3d/sphere/sphere.pro examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro examples/quick3d/tutorials/teapot_qml/teapot_qml.pro src/quick3d/quick3d.pri Change-Id: Ia14cfdcabd85b2264266d977f97a1216244a783c Reviewed-on: http://codereview.qt.nokia.com/1202 Reviewed-by: Sarah Jane Smith
* New skybox.Sarah Smith2011-07-066-0/+0
| | | | | | | | | Used the terragen program to create a skybox, free from any license issues. Much nicer than previous default skybox. Change-Id: I05bb72b523181f448e7c48d79d1b4bac907d6241 Reviewed-on: http://codereview.qt.nokia.com/1109 Reviewed-by: Sarah Jane Smith
* Fix windows bugs.Sarah Smith2011-07-062-4/+14
| | | | | | | | | | | | QTBUG-19382 and QTBUG-19275. If a Pictures directory exists and contains files but they could not be loaded, don't hang in the image loader. Change-Id: Ib0672af8e37bcbba473bae68558e959e0111e029 Reviewed-on: http://codereview.qt.nokia.com/1105 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Images cleanupSarah Smith2011-07-065-1/+0
| | | | | | | | | Remove unused images to save on space. Change-Id: I1399955cccdb1c4503b344bf3f639fe8b0afd93c Reviewed-on: http://codereview.qt.nokia.com/1108 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Refactor packaging.Sarah Smith2011-07-0611-279/+20
| | | | | | | | | | | | | | | | | | | | | | Packaging was always not so good. With the arrival of yet another packaging system to support, with QtSDK and Harmattan, it was overdue time to refactor the build system. Factored out all the places where Qt3D and QtQuick3D dependencies were exactly 3 levels below the source .pro file. This catches all of the examples and all of the demos, except for the ones in the tutorials directories. It is fine if those don't appear in packages, since their main value is in examining them in the IDE, rather than just having a package run them for you. It also catches both of the import plugins. Thus we save a huge amount of duplication of packaging information and can place the Qt SDK Harmattan packaging into a couple of variables in a new pkg.pri file. The two deps are now in a qt3d_pkg_dep.pri and qt3dquick_pkg_dep.pri file which include the pkg.pri. Change-Id: I28de17d7faa5ccf9157afad99471079c0b62ee87 Reviewed-on: http://codereview.qt.nokia.com/1191 Reviewed-by: Sarah Jane Smith
* Fix thread not exiting.Sarah Smith2011-07-051-1/+4
| | | | | | | | | | | | | | | | If a directory was found to scan, but no pictures were scanned there, the image manager would never exit, because there was never at least one loader created. Fix that by checking to see if there are no loaders waiting before queueing the stopAll. Fixes bug 19382. Change-Id: Iecf43f0695e03848a9eb7dbffc5275ec1e0bda5d Reviewed-on: http://codereview.qt.nokia.com/1111 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Some models not loading from QRC files while others worked.Patrick Burke2011-06-203-28/+39
| | | | | | Also modified robo_bounce to be qrc-ed. Change-Id: I3bb6c19b487aba35f3ff55fb948ed2fb0b901be5
* Fixed case-misspeled infinite, then removed since it wasn't wanted.Patrick Burke2011-06-201-3/+0
| | | | Change-Id: I478424d06861d236f20ee809b9e39fc83fae472f
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/quick3dSarah Smith2011-06-173-18/+0
|\ | | | | | | | | Conflicts: examples/qt3d/builder/builder.pro
| * Fixes install/uninstall components of pro files.Patrick Burke2011-06-143-18/+0
| | | | | | | | Change-Id: Ifae6515ccd48bc4129ae941f22b4af5279ec4c4a
* | Fix QTBUG-19249Sarah Smith2011-06-1724-0/+46
|/ | | | | | | | | | Other fixes to windows QML also needed, but this one was package related. Have setup to launch the sample programs by using windows shortcut (.lnk) files as these provide the ability to specify the current directory to run the program from, making it possible to locate the .dll's. Using shortcut files implies also have to create icons for all the programs as well.
* Fix maemo5 packaging.Sarah Smith2011-05-068-0/+112
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/quick3ddpope2011-05-035-11/+85
|\
| * Fixes to build system for mac.Sarah Smith2011-04-205-11/+85
| | | | | | | | | | | | Few paths wrong after recent windows commit. Change-Id: Ia414c346be6bda5b22a30972063432fdb60db283
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/quick3ddpope2011-04-2016-628/+52
|\|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/quick3dDaniel Pope2011-04-1510-499/+0
| |\ | | | | | | | | | | | | Conflicts: examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
| | * Cleanup old lander filesJulian de Bhal2011-04-1210-499/+0
| | | | | | | | | | | | Change-Id: Ic0e96b640061a13796d4082a537ad59e2304fb43
| * | Minor fixes to pro files.Daniel Pope2011-04-153-6/+3
| | |
| * | Fixes to QML files.Daniel Pope2011-04-151-106/+3
| | |
| * | Fixes for robot demo example.Daniel Pope2011-04-141-23/+25
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 10:12:39 +0000