summaryrefslogtreecommitdiffstats
path: root/tutorials
Commit message (Collapse)AuthorAgeFilesLines
* Fix namespace compilation.Sarah Smith2012-01-106-0/+12
| | | | | | | | | | | Back-ported from Qt5 changes: 24b1b6bd5c6a3960cfdf71cc644d95926430c267 d641f03b6efecce266ef329eb4bbc48d87c2fc12 2734491c7230bfa54af46ef56085a56e61eed8a0 f037bb1fa72b7dee790367776a913b18a07445ac Change-Id: I73e2e8996376ea40b9763224554aafba7fe7bdb6 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fixing harmattan pkgsSarah Smith2011-12-012-4/+4
| | | | | | | | | | | | | | | | | 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-262-28/+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-262-2/+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>
* Revert "Merge branch 'refactor'"Julian de Bhal2011-09-152-2/+2
| | | | | | | | | | 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-132-2/+2
|\ | | | | | | | | Conflicts: demos/quick3d/robo_bounce/main.cpp
| * compile with refactorGunnar Sletta2011-09-022-2/+2
| |
* | 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-122-0/+4
|/ | | | | | | 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 liccense headers.Jason McDonald2011-08-193-55/+54
| | | | | | Change-Id: I0f518965e0c97516dc0bba14a438b8d0dac2d9ce Reviewed-on: http://codereview.qt.nokia.com/2759 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Replace outdated license headers.Jason McDonald2011-08-052-2/+2
| | | | | | Change-Id: Iab34b5de6c61e9dacc0c780131018a7225102ce9 Reviewed-on: http://codereview.qt.nokia.com/2645 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Multiple fixes to build system.Patrick Burke2011-08-022-5/+2
| | | | | | | | | | | | 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 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-1510-18/+62
| | | | | | | 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-129-9/+9
| | | | | | Change-Id: If09c645392d34b4174c85462679dbe535fb5b521 Reviewed-on: http://codereview.qt.nokia.com/1476 Reviewed-by: Sarah Jane Smith
* Fixing tutorial installation problems.Patrick Burke2011-07-116-6/+6
| | | | | | | Change-Id: I890e3bf383421fa35dbb0acbef2e32cfa5077ca7 Reviewed-on: http://codereview.qt.nokia.com/1392 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* 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>
* Fix up misc symbian vs qtc clashes.Sarah Smith2011-07-068-2/+44
| | | | | | | | | | | Conflicts: examples/quick3d/photoroom/main.cpp pkg.pri Change-Id: I01238e324968f30c0a85177fa9db84e8d0d69ed4 Reviewed-on: http://codereview.qt.nokia.com/1124 Reviewed-by: Sarah Jane Smith
* Various symbian fixesSarah Smith2011-07-068-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Refactor packaging.Sarah Smith2011-07-0659-0/+3395
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 06:02:32 +0000