Commit Graph

247 Commits

Author SHA1 Message Date
Miikka Heikkinen 31f9c57bc5 Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL

Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2015-10-22 10:08:51 +00:00
Miikka Heikkinen 4162ddeb02 Update license headers
Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
2015-10-20 08:47:05 +00:00
Mika Salmela 67674dd748 Data member initialization removed from header.
Change-Id: I12ff4abfe54a54831f833a5e23a8367dd5792210
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2015-07-03 14:08:57 +00:00
Miikka Heikkinen a71eb045af Fix building against 5.6
Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS
macros instead of 'signals' and 'slots' in headers.

Change-Id: I4140b1fff4386d74bb371176919234366965e887
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2015-06-17 14:24:57 +03:00
Mika Salmela 273bae38cf Copyright header changes
Copyright header changes for 5.5.

Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-04-14 13:50:10 +03:00
Mika Salmela aa2abb9869 Dust and H2 to galaxy
Change-Id: I3bd3357fe73fbed68498311e0fd2a969980369a3
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-12-12 14:19:00 +02:00
Mika Salmela 1ab6dc3977 Write fps to file.
Change-Id: I303c243b25da0003ca86e5085b913f54a14dc86f
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-12-08 13:25:03 +02:00
Mika Salmela b492b27371 Fixes to galaxy.
Change-Id: I41a666177526db8563eee5799dee57e9994800dc
Signed-off-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-12-08 11:44:30 +02:00
Mika Salmela b439a667c0 Improve button width setting on perf tester.
Change-Id: I1106cfbfca839d6af09a6cc505e2630ab2b9dc49
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-12-04 15:39:12 +02:00
Mika Salmela 30f86f1037 Galaxy improvement.
Change-Id: I87ed53c41929e13e8d77236726b30dc5d89df077
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-12-04 11:36:19 +02:00
Mika Salmela deaab27525 Initial version of Galaxy.
Change-Id: I29898bed342022290c8c8a6c4459969ffba3df56
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-12-04 09:57:57 +02:00
Miikka Heikkinen cba93d8dea Fix WinRT issues.
Primary fix is to not use shared context in qml with WinRT,
as that causes black screen.

Also removed widget apps from build in WinRT.

Change-Id: Id65ce90dbeb80442194ab838952e8cadc91135a6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-19 15:56:56 +02:00
Miikka Heikkinen 99907042c7 Remove cpp autotests from android builds.
Change-Id: I1b80c618af7739ec42cac3cccdfc948e979c52d9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-17 11:14:22 +02:00
Miikka Heikkinen b6ee023ced Change copyright headers.
Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-11-07 10:22:35 +02:00
Miikka Heikkinen b6bf8a4b70 Fixed Valgrind reported issues in cpp tests
Change-Id: I284832fc697e0ac6ef1ba1bb857892a10cbcd8fd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-06 11:46:26 +02:00
Mika Salmela a1feedcf46 Qml perf data generation on cpp
Change-Id: If770c96ff84e49a747c4355e56bff002556cd659
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-11-03 11:23:13 +02:00
Miikka Heikkinen 89911624cf Allow small delay in scene test for viewport resize
On linux, there seems to be some asynchronous activity
related to window resizing, since calling processEvents() is not
enough to ensure viewport size gets updated in subViews test.
Use QTRY_COMPARE to allow for small delay.

Change-Id: Idae04ff9436c819ef150caa57f6fa988e4011746
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-31 09:19:13 +02:00
Miikka Heikkinen a96cf650b9 Fix crash when initializing QCustom3DLabel out of context.
Task-number: QTRD-3391
Change-Id: I5c2f2b674e50e7d39bc9355ebc9bcf05f22d5a39
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-29 13:08:40 +02:00
Miikka Heikkinen bf716cfdf0 Support for dynamic opengl builds.
Task-number: QTRD-3392
Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-29 09:35:29 +02:00
Miikka Heikkinen 33b3fe3784 Make build check for existence of quick module.
Change-Id: Icd04b72bb7bdbf34c73e6f27c90674fda4fc4cc2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-24 10:16:58 +03:00
Tomi Korpipää 0679c92560 Autotests ES2 fix
Some properties have different default values, or cannot be
changed at all on ES2.

Change-Id: Ieb3951f5692a645eafab492819ce18de19134335
Change-Id: Ieb3951f5692a645eafab492819ce18de19134335
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-23 11:40:41 +03:00
Tomi Korpipää 14ba79846a Added C++ autotests for custom items, labels and volumes.
Task-number: QTRD-3368
Change-Id: Ia6199669b0b70190de5a5d057c596093a051c1a9
Change-Id: Ia6199669b0b70190de5a5d057c596093a051c1a9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-23 09:08:58 +03:00
Tomi Korpipää 8b40f40c4b Added C++ autotests for input
Task-number: QTRD-3368
Change-Id: I0ca32bcaf4025cac24ece2e80fab6a2eee3562b0
Change-Id: I0ca32bcaf4025cac24ece2e80fab6a2eee3562b0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-10-22 12:28:49 +03:00
Tomi Korpipää a845ef527b Added C++ autotests for theme
Task-number: QTRD-3368
Change-Id: I369d8cad75f02a0cc585edad57c3ddcd8ef221d9
Change-Id: I369d8cad75f02a0cc585edad57c3ddcd8ef221d9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-22 11:09:53 +03:00
Tomi Korpipää 6be168da13 Added C++ autotests for scene, light and camera
Task-number: QTRD-3368
Change-Id: I6cd7a73477ac34d025c9bdcd7b775abab7d1426c
Change-Id: I6cd7a73477ac34d025c9bdcd7b775abab7d1426c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-22 09:31:26 +03:00
Tomi Korpipää 208cb0638f Added autotests for C++ axes
Task-number: QTRD-3368
Change-Id: I79f49ba839f191b64206f38763b2afff167757b7
Change-Id: I79f49ba839f191b64206f38763b2afff167757b7
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-10-22 06:13:00 +03:00
Tomi Korpipää f7f1e1373e Added C++ autotests for series
Also fixed a bug found in testing, and added tests for
optional constructors for already tested classes.

Task-number: QTRD-3368
Change-Id: I2214f28e2c5069ecab422fc6817acb2f0c0b192b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-21 11:23:12 +03:00
Tomi Korpipää ad4c012bcb Added C++ autotests for proxies.
Task-number: QTRD-3368
Change-Id: I9412afd4c6e79835ce8ee9587736e189d4f2fbf6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-20 11:11:20 +03:00
Tomi Korpipää dcbfe9d4c6 Added skeletons for C++ graph proxies and series
Task-number: QTRD-3368
Change-Id: I85680bfca28e5ed1039526310fdf89717b1e84ae
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-17 10:37:14 +03:00
Tomi Korpipää b25f6926de Added invalid value tests for QML autotests
Plus fixed a QML documentation bug, and added a missing
inheritance to docs.

Task-number: QTRD-3383
Change-Id: I1f7c56c49b829fee2cfd0731bbcc7e248a06a0c0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-17 09:06:43 +03:00
Miikka Heikkinen 425ece960c Fix memory leaks in volumetrictest app.
Change-Id: I742a5a5d7c69ef73ba469bfa4bac49a71b8f578a
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-17 08:54:10 +03:00
Tomi Korpipää a24d3628fc Test for QML proxies
Also added missing default values to some docs.

Task-number: QTRD-3368
Change-Id: I98940a80d6edfe60801c6b2606307b3ec3ab8c39
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-16 13:32:33 +03:00
Tomi Korpipää e12a902adc Added tests for QML axes
Task-number: QTRD-3368
Change-Id: Ie7be01bdbd0f63eccde39af86d1423d0af5df1b3
Change-Id: Ie7be01bdbd0f63eccde39af86d1423d0af5df1b3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-16 09:43:43 +03:00
Tomi Korpipää 9f6123afc3 Added tests for QML input
Also updated missing inheritance to docs

Task-number: QTRD-3368
Change-Id: I7b091009d7d89d601215bb4484b8eac7274bcf14
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-15 13:04:16 +03:00
Tomi Korpipää 3607a9c92b Added test for QML scene types
Also added missing version 1.2 properties to previously done
tests.

Task-number: QTRD-3368
Change-Id: Ifa5197cecc9bb95ca288a44ebcbd6fbcc0bf1e7d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-15 11:50:29 +03:00
Mika Salmela f5ee23bb1f Small cleanups for surface
Unnecessary modelMatrix multiplications removed. Intentional whitespace
removal.

Change-Id: I78b8e6f984d44baf7015c9551701b04cb869fc8b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-15 09:55:37 +03:00
Tomi Korpipää 733bff1b08 Added tests for QML custom items
Also added skeleton for remaining QML tests and some
inheritance updates to documentation.

Task-number: QTRD-3368
Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a
Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-15 09:51:10 +03:00
Tomi Korpipää c5d9c5c197 QML tests for theme
Task-number: QTRD-3368
Change-Id: I1fa3de637dafcd601490155e29fb36008b1eafcf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-15 09:37:22 +03:00
Miikka Heikkinen 91a9698b80 Simplify context handling at cleanup.
If the context exists at renderer deletion, it is possible that
it no longer has valid surface, which means it won't be possible
to set it back to current if we change context for deletion cleanup.
Since the current context will be one of our shared contexts anyway,
there is no need to do a dummy context for cleanup unless the current
context is null.

Change-Id: Ibabe081742beb975ee848ccb3690703ef5b027a9
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-15 09:37:17 +03:00
Miikka Heikkinen d0244a84f1 Gradient adjustment logic was broken.
Bug in adjustment logic caused adjustment to happen pretty much always.

Task-number: QTRD-3374
Change-Id: Id6151d2d3eb8369bbf9252e4eb4b76ed57fb1f3c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2014-10-14 13:33:04 +03:00
Tomi Korpipää 7d954d4852 QML series tests added
Task-number: QTRD-3368
Change-Id: I80ecdb1a9bcef6ed83d278d975d70f7794ff03c1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-14 11:35:19 +03:00
Tomi Korpipää 961600f654 Bars3D, Surface3D and Scatter3D tests
Task-number: QTRD-3368

+ Removed erroneous property from docs

Change-Id: I675e16b58e7b190b2b33d29029654039a60b5bfc
Change-Id: I675e16b58e7b190b2b33d29029654039a60b5bfc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-14 09:37:57 +03:00
Miikka Heikkinen 4f70d3777e Fix gradient artifacts on some edge cases
When static optimization is in use with mesh objects and range
gradient, and the object Y-value resolves into a texture coordinate
that is exactly on the texel boundary, the rendered fragments
of the object are not all same colors on some graphics cards,
despite all vertices having the same UV value.
Fixed by adjusting the Y-value slightly if it is close to the
boundary.

Task-number: QTRD-3370
Change-Id: Ie028602cbd9a00bb0e17049eb8f40feb8b18a6bf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-14 08:56:31 +03:00
Miikka Heikkinen 732c9f39f0 Fix context cleanup
Context was not getting properly cleaned up in cases where
render thread stopped before the cleanup took place.
Now we ensure that required cleanup is done before context
thread terminates.

Change-Id: I1489914dafec928eebb69bac737f6f858ff49432
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-13 10:33:10 +03:00
Tomi Korpipää 8ff6a5d6d8 Q3DBars, Q3DScatter and Q3DSurface autotests
Task-number: QTRD-3368
Change-Id: I86f1d632fe4421c35cc492161c7334602e6f61c0
Change-Id: I86f1d632fe4421c35cc492161c7334602e6f61c0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-13 10:23:56 +03:00
Mika Salmela fd9486b6cb Qml performance measurement app
Change-Id: I425da013160a12c1d2b3985e04059886d0695474
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2014-10-10 13:29:10 +03:00
Tomi Korpipää 220f236a18 Added initial CPP autotests
Task-number: QTRD-3368

Just a skeleton with a very basic test set for now.

Change-Id: I53309374a7d9cbfd06a4cdfbeb302f6649db9c4a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-10 13:27:07 +03:00
Tomi Korpipää cb5ab9bc21 Basic autotests for Bars3D, Scatter3D and Surface3D
Change-Id: I36b384d2bcb9d2db2464b3eaaaae2c76c3bb740c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-10 12:28:52 +03:00
Tomi Korpipää 93204b3bda Added initial QML autotests
Just a skeleton for now.

Change-Id: I27d577062e7e96880d843a87b71791f896bc2522
Change-Id: I27d577062e7e96880d843a87b71791f896bc2522
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-10 06:05:50 +03:00
Miikka Heikkinen f3a7378273 Fix screen position based queries in threaded rendering environment
QtQuick's threaded renderer doesn't seem to always pair up sync and
render (or more accurately, beforeSynchronizing and node's
preprocess calls). Sometimes sync comes without a followup render,
or there are two syncs in a row, even though the sync is using
direct connection. Both of these cases broke the old
logic for handling position based queries.

Changed the logic to actually ensure we have resolved the query
before emitting the relevant signal.

Task-number: QTRD-3358
Change-Id: Ica6c8c311f53a06311c21532aaabc18c28556655
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-09 10:09:31 +03:00