summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix namespace compilation.Sarah Smith2012-02-014-12/+9
| | | | | | | | | | | Back-ported from Qt5 changes: 24b1b6bd5c6a3960cfdf71cc644d95926430c267 d641f03b6efecce266ef329eb4bbc48d87c2fc12 2734491c7230bfa54af46ef56085a56e61eed8a0 f037bb1fa72b7dee790367776a913b18a07445ac Change-Id: I73e2e8996376ea40b9763224554aafba7fe7bdb6 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Don't use qt_snprintf outside of testlib.Sarah Smith2011-12-211-4/+4
| | | | | | | | | | qt_snprintf is an internal function of testlib which is likely to be removed in the future. Therefore, it should not be called from outside of testlib. Change-Id: I22ede3fbfd6e899aa66f32a6666f13bdda86a849 Reviewed-by: Patrick Burke <patrick.burke@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Mesh conversion on Cylinder and Capsule.Sarah Smith2011-12-067-1/+186
| | | | | | | | | | | | | | | | | | | | | | Follow the example of the Sphere and convert Cylinder and Capsule to being meshes as well. Add some useful doc to the three classes showing the performance and other considerations for each. Add a basic manual test, with a README. Slightly improve the warning message from QDeclarativeMesh. Fix a bug with Sphere where nothing would display if the default values for a sphere were used. This was because the createGeometry() function was only triggered when properties changed. Now also trigger it if draw is called and the scenegraph for the object has not yet been created. Same code was also required on the new shape meshes. Change-Id: I475e34e31741ba8583587961fc3d0ee3d03bcb9d Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Modify the sphere so it is a mesh.Sarah Smith2011-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | There was a performance bug illustrated by a Qt3D user where an app that had a large number of identical spheres, took minutes to load. The problem was that even though the geometry was identical there was no way to utilise this to create a scene with multiple items referencing one sphere, because the geometry actually was being created in the draw function.... Now fixed so that the Sphere becomes a SphereMesh which can be referenced from any number of Item3D's. Added a Sphere convenience class so that legacy code will keep working. Updated the solarsystem_qml class to use the new functionality. Change-Id: I62a60b519bbb048ecadaa09e0d5520ddb49ff100 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Fixing harmattan pkgsSarah Smith2011-12-0121-19/+23
| | | | | | | | | | | | | | | | | 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>
* Revert "Make standalone Item3Ds work."Patrick Burke2011-11-157-171/+0
| | | | | | | This reverts commit f05af7cd00ef88dcfabb4b62c81b661684ef94e6. Change-Id: I3f2f376013c56f2583fbf5974435980158f0e265 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Make standalone Item3Ds work.Sarah Smith2011-11-107-0/+171
| | | | | | | | | | | | | | | | | | | | This is kind of a hack but its so succinct and seems to work so well that I'm inclined to give it a run and see if there is any problems with it before going for something much more complex and disruptive. The alternative would be to try to factor out the rendering logic from the Viewport class into a new class in the libQt3DQuick.so - where it can be accessed by the Item3D implementation (QDeclarativeItem3D) and to make a basic Viewport QML item that used the rendering logic, and to have Item3D use it if it was not a descendant of a Viewport. The hack is good because it avoids all this hand-wringing and anxiety by simply asking the declarative system to create us a viewport using a piece of script, so we don't even need to reference the viewport class at all. Change-Id: I16b4d4666c86e679dd4b9d81c54a8cd12f4a957a Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Manual lighting test for QTBUG-22414 (currently broken).Julian de Bhal2011-11-018-0/+304
| | | | | Change-Id: I0575d207c16852ddda3ee234405801825d7930ca Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* QTBUG-19908 Do not crash with null / invalid shadersJulian de Bhal2011-10-042-0/+136
| | | | | | | Change-Id: I8aa01cb85d63e135f5ca1570f38d8f7803e7dfe1 Reviewed-on: http://codereview.qt-project.org/5959 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Make qml test files visible in creator project browserJulian de Bhal2011-10-041-0/+16
| | | | | | | Change-Id: I430b08ad73bfef5047cd84b52f1dc7c994d52cac Reviewed-on: http://codereview.qt-project.org/5910 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Icons updated for all platforms.Danny Pope2011-09-279-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 "pass make check"Julian de Bhal2011-09-151-1/+0
| | | | | | | | | This reverts commit 76e2cd5378fabeeb3cb438c7bf31e16c98d0cb77. Change-Id: Ic52ab29b0857f3fc56773e4f51717228ea337890 Reviewed-on: http://codereview.qt-project.org/4929 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-1517-21/+11
| | | | | | | | | | 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>
* pass make checkGunnar Sletta2011-09-131-0/+1
|
* Merge branch 'refactor'Gunnar Sletta2011-09-1317-11/+21
|\ | | | | | | | | Conflicts: demos/quick3d/robo_bounce/main.cpp
| * compile with refactorGunnar Sletta2011-09-0217-11/+21
| |
* | 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>
* | added system tests for qtquick3dZheng Liu (George)2011-09-082-0/+1105
|/ | | | | | | | added project file and qtt file Change-Id: I8cdfc82f28808506ecb3036d65f185ba3765923e Reviewed-on: http://codereview.qt-project.org/4391 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* QTBUG-17413 Network loading: 3d models in Qt3DDanny Pope2011-08-311-1/+1
| | | | | | | Change-Id: I6aab8308f752900e2fdab037743d3aa8c5b2da91 Reviewed-on: http://codereview.qt.nokia.com/3891 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-1918-0/+738
| | | | | | Change-Id: I0f518965e0c97516dc0bba14a438b8d0dac2d9ce Reviewed-on: http://codereview.qt.nokia.com/2759 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* QTBUG-20054 - network loading of images as textures.Danny Pope2011-08-101-1/+2
| | | | | | | Change-Id: I4e3e91b292386f60aa6a75a21c1a3637d1e5df60 Reviewed-on: http://codereview.qt.nokia.com/2547 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Replace outdated license headers.Jason McDonald2011-08-0575-1362/+1362
| | | | | | | Change-Id: I4c0827759fb6e27846d76977ca16c835f98efa15 Reviewed-on: http://codereview.qt.nokia.com/2617 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* QTBUG-20716 Core changes to make Symbian work with the new repo/packaging rules.Danny Pope2011-08-032-0/+22
| | | | | | | Change-Id: I710f191a90f5b024368fccebb4e61d1eac71f219 Reviewed-on: http://codereview.qt.nokia.com/2544 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Multiple fixes to build system.Patrick Burke2011-08-0210-41/+20
| | | | | | | | | | | | 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>
* Fix QTBUG-18823.Sarah Smith2011-07-281-22/+73
| | | | | | | | | | | | | | | | | | | | | | | | Implemented correctly the clip space algorithm and fixed a number of minor but fatal problems with the previous implementation. Also added useful debug to the camera class, which helped during debugging. Made a correction to the frustum doc, which impacted the testing work, and added a section on the aspect ratio which had garnered some questions on the list. In the tests, added some tests that cover the view frustum being forwards or backwards over the object being viewed/culled, which was not covered before. Change-Id: I488441eb89b5b112daa973d13260880ee3286038 Reviewed-on: http://codereview.qt.nokia.com/2258 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Zheng Liu <zheng.g.liu@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Final major change to cleanup build system.Patrick Burke2011-07-2810-0/+30
| | | | | | | | | | | 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 qt3dquick_pkg_dep.pri.Patrick Burke2011-07-2710-20/+10
| | | | | | 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-2710-10/+20
| | | | | | Change-Id: Ief07b4656cb676ea74ec389154ffd07dfde50abd Reviewed-on: http://codereview.qt.nokia.com/2229 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* First round of fixing QTBUG-18823Sarah Smith2011-07-221-23/+112
| | | | | | | | | | | | | | | | | | | | | | Fixing reported problems with the isCullable function. Implement an improved very clear unit test for the isCullable functions, that are split out by value rather than being buried in a for loop. Also spend some time documenting the expected beha- vior of these functions and visualising this. The isCullableVert test has been marked with QSKIP(..., SkipAll) which means that CI should let it pass so we can integrate and keep moving on with a fix for the bug. Change-Id: Ibb8c9493256cb1480c2bbda1792f3751830031cd Reviewed-on: http://codereview.qt.nokia.com/1928 Reviewed-by: Julian de Bhal <julian.debhal@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>
* QTBUG-19687 - Fix picking for dynamically created Item3DsJulian de Bhal2011-07-181-0/+34
| | | | | | | Change-Id: I3f46cf64ede0cf0647ca1cfc2fc95e837500a07c Reviewed-on: http://codereview.qt.nokia.com/1340 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* More harmattan SDK fixups.Sarah Smith2011-07-131-0/+1
| | | | | | | | Add change id. Change-Id: Iae6bf8b7d33465d1dcc9726af5dd07020c257e9a Reviewed-on: http://codereview.qt.nokia.com/1554 Reviewed-by: Sarah Jane Smith
* Updating all qml files to standardize on "import QtQuick 1.0".Patrick Burke2011-07-1210-10/+10
| | | | | | Change-Id: If09c645392d34b4174c85462679dbe535fb5b521 Reviewed-on: http://codereview.qt.nokia.com/1476 Reviewed-by: Sarah Jane Smith
* Fixed building issues.Patrick Burke2011-07-0817-52/+25
| | | | | | | | | | | | | | | | 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>
* Updating qrc example to new DeclarativeView3D view.Patrick Burke2011-07-082-6/+5
| | | | | | | | | Also added some documentary comments to loading files from qrc. Change-Id: I5f0c1e72eecdf39bb8409a97b2bd227b2fb03c18 Reviewed-on: http://codereview.qt.nokia.com/1335 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Fix test textures for modelview autotestJulian de Bhal2011-07-077-22/+23
| | | | | | | Change-Id: I2b8fe0a7ec59d44d89e233d48c2410c22ce92fea Reviewed-on: http://codereview.qt.nokia.com/1224 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Removing accidentally added symlink.Patrick Burke2011-07-071-1/+0
| | | | | | | Change-Id: I479d752620051021c7b77b0f0c8cb9b4ce2d10fb Reviewed-on: http://codereview.qt.nokia.com/1266 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Fix up misc symbian vs qtc clashes.Sarah Smith2011-07-0618-1/+206
| | | | | | | | | | | Conflicts: examples/quick3d/photoroom/main.cpp pkg.pri Change-Id: I01238e324968f30c0a85177fa9db84e8d0d69ed4 Reviewed-on: http://codereview.qt.nokia.com/1124 Reviewed-by: Sarah Jane Smith
* Fixed broken benchmark.Patrick Burke2011-07-061-1/+1
| | | | | | | | | No-one had apparently run it in a while. Change-Id: I7dd292f322f93c081fb252f847d56b13a5dd3738 Reviewed-on: http://codereview.qt.nokia.com/1198 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Documentation, autotests and examples for Item3D modelviewJulian de Bhal2011-07-062-0/+270
| | | | | | | Change-Id: I63cbd719938c12e686026d6465a733a060d35538 Reviewed-on: http://codereview.qt.nokia.com/1135 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Refactor QDeclarativeItem3D to use QDeclarativeItem's parent tree.Julian de Bhal2011-07-061-11/+8
| | | | | | | Change-Id: I2b7709b36112795d5a3c501fa04a040c8bb5c3d8 Reviewed-on: http://codereview.qt.nokia.com/1134 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Refactor packaging.Sarah Smith2011-07-0610-424/+29
| | | | | | | | | | | | | | | | | | | | | | 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
* Trade fprintf(stderr... for qWarningSarah Smith2011-07-051-1/+1
| | | | | | | | | | On windows the qWarning is magically visible in the Qt Creator output window but fprintf is not. Change-Id: If89ddac204b476abf2a1514d52771156ce3eea9a Reviewed-on: http://codereview.qt.nokia.com/1112 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixes install/uninstall components of pro files.Patrick Burke2011-06-149-67/+18
| | | | Change-Id: Ifae6515ccd48bc4129ae941f22b4af5279ec4c4a
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/quick3dSarah Smith2011-06-091-0/+159
|\ | | | | | | | | | | | | Conflicts: tests/auto/threed/qglscenenode/tst_qglscenenode.cpp Change-Id: I2ec395ac70ebc7b3ca69b649b3288e02bf03d43b
| * Remove out of date commentsJulian de Bhal2011-06-091-2/+0
| | | | | | | | Change-Id: I5a21506a41ccc326d6efc8739400d141eb84d48f
| * Autotest for QTBUG-19299Julian de Bhal2011-06-081-0/+161
| | | | | | | | Change-Id: I1189b6c488f2e05a74e149148724936041186374
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 18:49:51 +0000