Commit Graph

1304 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
Tomi Korpipää fc1ea78231 Fixed OpenGL 3.x crash
Change-Id: I43bd6f8d2f565a989e4d48d68a8c610240ed35fb
Task-number: QTRD-3492
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-10-19 07:23:56 +00:00
Jędrzej Nowacki 22d919936d Follow Qt 5.6 branch
Change-Id: I7847f592cb5d69b8b6ddf03f11a285d64dbce00c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2015-10-19 06:37:19 +00:00
Friedemann Kleint 981213f0ad Fix compilation with namespaced Qt.
Task-number: QTRD-3655
Change-Id: Id68e9cec8d1093fe1557b07a148ae04a27656284
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-09-21 13:13:13 +00:00
Miikka Heikkinen dc6dcf918b Fix compile warnings about shadow
Renamed some function parameters so that they do not trigger shadow
warnings.

Change-Id: Iea6561d26d3f77d075fc7f30b047bfa4d34cb2e7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2015-09-14 04:02:44 +00:00
Miikka Heikkinen b8b107f178 Correct file version, description, and product name
Change-Id: Ic90d3b04434d07e12c313c56d7217d7bf550cdb3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-11 10:24:00 +00:00
Miikka Heikkinen 8fbd586427 Version numbers and change file update for 1.2.2
Change-Id: I2933c3fd121d6c20bf2e5585aed63351046318ed
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2015-09-11 10:00:54 +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
Miikka Heikkinen 916d67d266 Add dist file for 1.2.1 and change version numbers
Change-Id: Ia6bd240a8737fe9dbb6bf2d019cb032c7b60a874
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2015-04-14 14:21:03 +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
Caroline Chao 0a18b2fffc qmlscatter example: Give a default size to the view item
On OS X the content item of the view must have a valid width
or height.

Change-Id: I6903671a9bd39511a4d0d649819b68930597260d
Task-number: QTRD-3469
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2015-03-11 09:14:46 +02:00
Tomi Korpipää 0e9d60eee9 Qt 5.5 fixes
Change-Id: I01260f9849340ea5cce2b5c00aa6c2c50192720c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-02-23 13:20:45 +02: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
Mika Salmela 9644652e37 Once more crash fix on texture adding.
B2Qt device called uvs creation before array creation.

Change-Id: Ia0cac175a3e0769f2571a0eadc7c764ae4092cc2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-21 15:31:31 +02:00
Mika Salmela 6939d7e10a Fix crash when adding a texture on QML
When texture was attached on the qmlsurface example, the smoothUVs was
called before the actual model mesh was created.

Change-Id: I5a62b06291232df54ce08d586d8794b332a4eece
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-21 14:36:44 +02:00
Miikka Heikkinen cf47756e17 Minor tweaks to texturesurface example.
Change the color of untextured surface so it isn't included
in the gradient. Also make it clear the gradient is for
highlight only.

Change-Id: I822c59b905559da10a987e4a7d616d01dccdedba
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-11-21 13:51:18 +02:00
Miikka Heikkinen 4830e55e98 Fix flickering in android on some examples when zooming.
Change-Id: I3c9de6801430dc74c97fb6563ded6114befc6968
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-21 13:51:14 +02:00
Miikka Heikkinen 7b2cd00ce8 Fix invalid enum error in OpenGL ES2 builds.
Change-Id: Ib4587a608a7b79d863d51e1a9ecd150996245fa7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-21 13:51:10 +02:00
Miikka Heikkinen 2f7c12bfee Make customitems example actually show some custom items.
Change-Id: I056b71fc913e5fd68b895d6bf4b5676cbe7c6db0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-21 13:51:05 +02:00
Miikka Heikkinen dfdbe9c36f Fix incorrect shader initialization for static optimized es2
Change-Id: I8fdacfde272ace4c25c74c316de514cd4275da74
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-11-21 09:55:03 +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 11ed44c13c Support larger custom meshes.
Vertex index was limited to unsigned short, meaning even slightly
complex meshes couldn't be used. Changed to unsigned int.

Also removed unused vertex indexer methods.

Change-Id: Iebe62bd3a501dc79ee2857cca28ac0d05bd4a55e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-18 10:59:39 +02:00
Miikka Heikkinen d22799efdb Some doc updates
Change-Id: Ib4bb651877db4aa0dfd13cb8f1c08e786960a221
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-18 08:58:32 +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 dfcc8c6d75 Fix the required creator version
Change-Id: I14c8a065bf89b471c31f1cdad2550f35e02ef233
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-14 14:54:33 +02:00
Thomas Hartmann 6c1c470c16 renaming toolTip to tooltip
This was changed in Qt Creator 3.3 for consistency reasons.

Change-Id: I164b5bff88b2cc3091aaf48e57fb12ef60e2a6aa
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-14 14:33:39 +02:00
Miikka Heikkinen 5d24897d35 Fix typo in docs
Change-Id: Iad4d07765b9f1310baf3b43d5307906c9887bca6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-13 16:26:45 +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
Tomi Korpipää 46ef32d424 Added flags to software renderer test
Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b
Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-05 12:55:59 +02:00
Tomi Korpipää f19693253d Fixed font size jumping in ES2
Task-number: QTRD-3412
Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4
Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-11-05 10:41:14 +02:00
Tomi Korpipää 39d5ffbdc4 Force software renderer to using ES2
Task-number: QTRD-3410
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-05 10:31:40 +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 0090db1602 Fix compiler warning on 64bit linux
Change-Id: I4ab8d595ac9f8b069057178079ad7714eaf6e13c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-03 10:20:40 +02:00
Miikka Heikkinen 8a7c69cb94 Fix qmloscilloscope linking issue on some envs
Change-Id: Iab45f95e8ff0faacc5cf50fdf052bf2c69d7988a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-03 10:20:34 +02:00
Tomi Korpipää 8cebfaed90 Fixed surface slice problem
Task-number: QTRD-3402
Change-Id: I70ef641fc7249b144d6e98971f1fb74f2935d706
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-10-31 13:11:15 +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 2d61b8f27a Use QOffscreenSurface instead of QWindow for dummy surfaces.
Android doesn't like creating extra QWindows, so changed
dummy surfaces used to do static initialization and cleanup
to use QOffscreenSurface.

Change-Id: Ia42e288a05ef49524252c457f3a3494677e3fc63
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-10-30 14:51:11 +02:00
Miikka Heikkinen 20d1d25119 Fix crash on qmloscilloscope in Qt 5.4
Binding slider value to its minimum value is not correct,
so just initialize it on component complete.

Change-Id: Ia21ecbffdef84448b70c6b09d240ea4f854ca541
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-10-30 14:50:46 +02:00
Miikka Heikkinen bed7f3fbf6 Fix another crash at app shutdown.
Context doesn't exist on all envs at shutdown.

Change-Id: I6c0398203f0ab3ceaa38f64936cdf375c43e9f55
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-30 12:35:16 +02:00
Miikka Heikkinen d430a51768 Fix crash on application shutdown.
Label items should not try to delete their textures at destructor if
they are already deleted.

Change-Id: I8131301bec47a0a2617b4a923d7cce430d35e18b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-30 10:11:13 +02:00
Tomi Korpipää 8abb93bef6 Designer plugin bug fix
Radiallabeloffset needs 2 decimals, as step size is 0.01

Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab
Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-30 09:54:28 +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