summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop'v1.2.0Miikka Heikkinen2014-11-211-5/+13
|\ | | | | | | Change-Id: Iea324a1101b33b60686038116c422e99f79dff3e
| * Once more crash fix on texture adding.Mika Salmela2014-11-211-5/+13
| | | | | | | | | | | | | | B2Qt device called uvs creation before array creation. Change-Id: Ia0cac175a3e0769f2571a0eadc7c764ae4092cc2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2014-11-211-5/+7
|\| | | | | | | Change-Id: I51bb8521cca5373cb5e7f364d9ced538b82de86a
| * Fix crash when adding a texture on QMLMika Salmela2014-11-211-5/+7
| | | | | | | | | | | | | | | | 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>
* | Merge branch 'develop'Miikka Heikkinen2014-11-217-13/+18
|\| | | | | | | Change-Id: I29b28286f0faac3180d0df2d4b2e9de13362149d
| * Minor tweaks to texturesurface example.Miikka Heikkinen2014-11-212-1/+2
| | | | | | | | | | | | | | | | | | 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>
| * Fix flickering in android on some examples when zooming.Miikka Heikkinen2014-11-211-0/+5
| | | | | | | | | | Change-Id: I3c9de6801430dc74c97fb6563ded6114befc6968 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Fix invalid enum error in OpenGL ES2 builds.Miikka Heikkinen2014-11-212-10/+4
| | | | | | | | | | Change-Id: Ib4587a608a7b79d863d51e1a9ecd150996245fa7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Make customitems example actually show some custom items.Miikka Heikkinen2014-11-212-0/+5
| | | | | | | | | | Change-Id: I056b71fc913e5fd68b895d6bf4b5676cbe7c6db0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Fix incorrect shader initialization for static optimized es2Miikka Heikkinen2014-11-211-2/+2
| | | | | | | | | | | | Change-Id: I8fdacfde272ace4c25c74c316de514cd4275da74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2014-11-1915-28/+28
|\| | | | | | | Change-Id: Ic97fe9c9e7e12acb86a9798326cfff30d09a229b
| * Fix WinRT issues.Miikka Heikkinen2014-11-1915-28/+28
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'develop'Miikka Heikkinen2014-11-1817-128/+27
|\| | | | | | | Change-Id: I6f95e28fa94127ddf2380794323fa5ef0ddfe2c4
| * Support larger custom meshes.Miikka Heikkinen2014-11-1814-126/+23
| | | | | | | | | | | | | | | | | | | | 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>
| * Some doc updatesMiikka Heikkinen2014-11-182-1/+3
| | | | | | | | | | Change-Id: Ib4bb651877db4aa0dfd13cb8f1c08e786960a221 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Remove cpp autotests from android builds.Miikka Heikkinen2014-11-171-1/+1
| | | | | | | | | | Change-Id: I1b80c618af7739ec42cac3cccdfc948e979c52d9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* | Merge branch 'develop'Miikka Heikkinen2014-11-145-42/+42
|\| | | | | | | Change-Id: I1ac2c37e8731e64ba005a742d6e4923ff3ded01b
| * Fix the required creator versionMiikka Heikkinen2014-11-141-1/+1
| | | | | | | | | | Change-Id: I14c8a065bf89b471c31f1cdad2550f35e02ef233 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * renaming toolTip to tooltipThomas Hartmann2014-11-143-40/+40
| | | | | | | | | | | | | | | | 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>
| * Fix typo in docsMiikka Heikkinen2014-11-131-1/+1
| | | | | | | | | | Change-Id: Iad4d07765b9f1310baf3b43d5307906c9887bca6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2014-11-10463-3320/+3349
|\| | | | | | | Change-Id: Iaf433860fb57187c5628403cb1cfbe027f175cc3
| * Change copyright headers.Miikka Heikkinen2014-11-07462-3233/+3233
| | | | | | | | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Fixed Valgrind reported issues in cpp testsMiikka Heikkinen2014-11-069-87/+116
| | | | | | | | | | Change-Id: I284832fc697e0ac6ef1ba1bb857892a10cbcd8fd Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* | Merge branch 'develop'Miikka Heikkinen2014-11-0623-105/+232
|\| | | | | | | Change-Id: I2f27b074a095cd449a92778be4681f5e56590e17
| * Added flags to software renderer test Tomi Korpipää2014-11-052-0/+4
| | | | | | | | | | | | Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Fixed font size jumping in ES2 Tomi Korpipää2014-11-051-1/+1
| | | | | | | | | | | | | | | | 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>
| * Force software renderer to using ES2 Tomi Korpipää2014-11-054-11/+59
| | | | | | | | | | | | | | Task-number: QTRD-3410 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Qml perf data generation on cppMika Salmela2014-11-036-30/+104
| | | | | | | | | | Change-Id: If770c96ff84e49a747c4355e56bff002556cd659 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Fix compiler warning on 64bit linuxMiikka Heikkinen2014-11-032-3/+3
| | | | | | | | | | Change-Id: I4ab8d595ac9f8b069057178079ad7714eaf6e13c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Fix qmloscilloscope linking issue on some envsMiikka Heikkinen2014-11-031-1/+1
| | | | | | | | | | Change-Id: Iab45f95e8ff0faacc5cf50fdf052bf2c69d7988a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Fixed surface slice problemTomi Korpipää2014-10-311-1/+1
| | | | | | | | | | | | Task-number: QTRD-3402 Change-Id: I70ef641fc7249b144d6e98971f1fb74f2935d706 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Allow small delay in scene test for viewport resizeMiikka Heikkinen2014-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
| * Use QOffscreenSurface instead of QWindow for dummy surfaces.Miikka Heikkinen2014-10-303-9/+7
| | | | | | | | | | | | | | | | | | 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>
| * Fix crash on qmloscilloscope in Qt 5.4Miikka Heikkinen2014-10-302-2/+2
| | | | | | | | | | | | | | | | 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>
| * Fix another crash at app shutdown.Miikka Heikkinen2014-10-301-3/+2
| | | | | | | | | | | | | | Context doesn't exist on all envs at shutdown. Change-Id: I6c0398203f0ab3ceaa38f64936cdf375c43e9f55 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Fix crash on application shutdown.Miikka Heikkinen2014-10-301-1/+1
| | | | | | | | | | | | | | | | 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>
| * Designer plugin bug fix Tomi Korpipää2014-10-302-2/+2
| | | | | | | | | | | | | | | | Radiallabeloffset needs 2 decimals, as step size is 0.01 Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Fix crash when initializing QCustom3DLabel out of context.Miikka Heikkinen2014-10-293-45/+49
| | | | | | | | | | | | Task-number: QTRD-3391 Change-Id: I5c2f2b674e50e7d39bc9355ebc9bcf05f22d5a39 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* | Merge branch 'develop'Miikka Heikkinen2014-10-291-0/+2
|\| | | | | | | Change-Id: Ibe4506327879efaf895a087bd4e4445c14bbdddd
| * Add missing includes to utils.cpp.Miikka Heikkinen2014-10-291-0/+2
| | | | | | | | | | Change-Id: I46db1f02575b8d140890708bf04633fa23f28a15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Added the 1.1.1 changes file to develop branch.Miikka Heikkinen2014-10-291-0/+5
| | | | | | | | | | Change-Id: Ie1ecdf4b0c48e9040b896ffdf695049c26aafbe2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2014-10-29324-3104/+32714
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf README src/datavisualization/global/qdatavisualizationglobal.h Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
| * Support for dynamic opengl builds.Miikka Heikkinen2014-10-2929-1100/+1063
| | | | | | | | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Squeeze labels on ES2Mika Salmela2014-10-283-10/+28
| | | | | | | | | | | | | | | | | | | | If the label text with slightly smaller font would fit into smaller texture, force to use the smaller one. Task-number: QTRD-3395 Change-Id: Ib70f6722ea8403e4aa25ed190b21c059d9d0e062 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Added v1.2 properties to designer pluginTomi Korpipää2014-10-283-0/+228
| | | | | | | | | | | | | | | | Also added missing properties from v1.1. Task-number: QTRD-3396 Change-Id: Ic001e726dbe09238ab51b1fdfb2a58d99b5e29e2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Updated minimum Qt version to 5.2.1 Tomi Korpipää2014-10-271-1/+1
| | | | | | | | | | | | Change-Id: I56bcd9eee06dc3ca6a282e97eefaecfd0d017e6e Change-Id: I56bcd9eee06dc3ca6a282e97eefaecfd0d017e6e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Mac touchpad support addedTomi Korpipää2014-10-274-1/+30
| | | | | | | | | | | | Task-number: QTRD-2286 Change-Id: Ibe211caedab231e908af900af65d4075b926a875 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Make build check for existence of quick module.Miikka Heikkinen2014-10-244-36/+49
| | | | | | | | | | Change-Id: Icd04b72bb7bdbf34c73e6f27c90674fda4fc4cc2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Release housekeepingMiikka Heikkinen2014-10-2412-80/+317
| | | | | | | | | | | | | | | | | | - Changed the version number to 1.2 where relevant. - Regenerated plugins.qmltypes - Updated known issues Change-Id: I5f737a970d0ac7fc14dbd2d30a8684ecced45ac0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Autotests ES2 fix Tomi Korpipää2014-10-233-18/+45
| | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 12:50:29 +0000