summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.6Oswald Buddenhagen2016-11-291-1/+1
| | | | Change-Id: I5b03a4a6e5f4acb32bd75585a477b18137155428
* do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | it's done centrally now. Change-Id: I70d8aeb77388aa3895007b7aa03f84dad085bc2a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Set up relation with c++ module correctlyTomi Korpipää2016-05-241-3/+1
| | | | | | | TARGETPATH to be removed in 5.7 Change-Id: I5f2b7c6c82e10bed6b7a2358d8269bc0aef26542 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Don't duplicate functionality from various .prf filesTomi Korpipää2016-05-231-7/+0
| | | | | | Change-Id: Ibaf10cb5806dae0287888a20d26e34d4dfefff75 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove unused non-standard test export macrosTomi Korpipää2016-05-231-8/+0
| | | | | Change-Id: Ifcfb6eaddfd5e54820bb3f5af235833b7f906b3c Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Use standardized module export macrosTomi Korpipää2016-05-232-16/+9
| | | | | | Change-Id: Id6122641b63d8e1435314c1ae8492a7ee96b25a8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove redundant handling of static buildsTomi Korpipää2016-05-201-3/+0
| | | | | | Change-Id: I7f504bcd21045d6eaf2534d3ab2416b402e88b87 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Place load(qt_module) at the end of the project fileTomi Korpipää2016-05-201-2/+1
| | | | | | Change-Id: I612e0334d72c0405b7c180c1e90381eb5641dcaa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove debug messageTomi Korpipää2016-05-191-1/+0
| | | | | Change-Id: I7bab1d2f8187a65abf3602e19e9baa6f78d0c496 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* fix namespaced buildOswald Buddenhagen2016-04-061-0/+3
| | | | | Change-Id: I76b85f4e2653f20a368b4b413b29c733a6a3f300 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Add explicit and make public headers compile with ↵Marc Mutz2016-03-0333-98/+98
| | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* qutils.h: pass the headerclean checkMarc Mutz2016-03-031-1/+1
| | | | | | | C-style casts aren't allowed in public headers. Change-Id: I1c1d6efb534b767d2ac06ecfae782b7a34bf37eb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix sync.profile dependency versioningv1.2.2Simon Hausmann2016-01-251-2/+2
| | | | | | | | Do not hard-code the version of the dependencies here, the CI system determines the version based on the target branch of the module. Change-Id: I2da5c352d5ef3ef0b63bb411596ae47db40a76b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove some manual test appsMiikka Heikkinen2016-01-13163-49031/+1
| | | | | | | | | | | Removed - Kinectsurface - Has 3rd party code. - qmlcamera - Ugly mess and kinda pointless. - qmlmultiwindow - Test is not relevant and is buggy. - spectrum - Has 3rd party code. Change-Id: Ic28ffddf9e45f51a5320d4ebd0e2b7b373452cb7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Merge branch 'develop'Miikka Heikkinen2015-11-091-10/+0
|\ | | | | | | Change-Id: Iadc933f0db06f65013f74d5764b51be43bd79ebd
| * Fix debug-and-release buildFrederik Gladhorn2015-11-061-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Datavis is part of the Qt release and there is no need to do magic hacks to install the qmldir file. This was supposed to help running examples separately, but we assume that the lib is shipped with Qt proper. The problem was that the qmldir file would be simultaneously copied into the same location twice which will fail on Windows. Change-Id: I1879fc5ff6303104392a66e54d5c278752a12655 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2015-10-293-1/+4
|\| | | | | | | Change-Id: I198fd13ce1975833d02db39bde5a718ea60be623
| * Fix the leaking framebuffer on graph resizeMiikka Heikkinen2015-10-292-0/+3
| | | | | | | | | | Change-Id: I97e32b56a81afe22aa237055ff6d7db2399b70d3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * OpenGL warning fixTomi Korpipää2015-10-271-1/+1
| | | | | | | | | | Change-Id: I296a28c2dd105fdd7df6c9fe1ccf30186541e64d Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2015-10-22646-5387/+7058
|\| | | | | | | Change-Id: Id4ff4c5196d35401f647e70a8c2a127d1c77629f
| * Fix issues with COIN buildsMiikka Heikkinen2015-10-22267-212/+477
| | | | | | | | | | | | | | | | | | | | | | | | -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>
| * Update license headersMiikka Heikkinen2015-10-20468-5148/+6552
| | | | | | | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
| * Fixed OpenGL 3.x crashTomi Korpipää2015-10-191-0/+2
| | | | | | | | | | | | Change-Id: I43bd6f8d2f565a989e4d48d68a8c610240ed35fb Task-number: QTRD-3492 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Follow Qt 5.6 branchJędrzej Nowacki2015-10-191-2/+2
| | | | | | | | | | Change-Id: I7847f592cb5d69b8b6ddf03f11a285d64dbce00c Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* | Depend directly on 5.6 branchJędrzej Nowacki2015-10-161-2/+2
| | | | | | | | | | Change-Id: I5454749905a78372704c8a317fc56d17428af6b0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2015-09-289-6/+12
|\| | | | | | | Change-Id: I3ac421702add928023ba838355aa88df5cdc7d6c
| * Fix compilation with namespaced Qt.Friedemann Kleint2015-09-219-6/+12
| | | | | | | | | | | | Task-number: QTRD-3655 Change-Id: Id68e9cec8d1093fe1557b07a148ae04a27656284 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Merge branch 'develop'Miikka Heikkinen2015-09-1496-138/+156
|\| | | | | | | Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce
| * Fix compile warnings about shadowMiikka Heikkinen2015-09-146-13/+13
| | | | | | | | | | | | | | | | Renamed some function parameters so that they do not trigger shadow warnings. Change-Id: Iea6561d26d3f77d075fc7f30b047bfa4d34cb2e7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * Correct file version, description, and product nameMiikka Heikkinen2015-09-112-0/+10
| | | | | | | | | | Change-Id: Ic90d3b04434d07e12c313c56d7217d7bf550cdb3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Version numbers and change file update for 1.2.2Miikka Heikkinen2015-09-115-9/+15
| | | | | | | | | | Change-Id: I2933c3fd121d6c20bf2e5585aed63351046318ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * Data member initialization removed from header.Mika Salmela2015-07-032-7/+9
| | | | | | | | | | Change-Id: I12ff4abfe54a54831f833a5e23a8367dd5792210 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Fix building against 5.6Miikka Heikkinen2015-06-1781-109/+109
| | | | | | | | | | | | | | | | 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>
* | Merge branch 'develop'v1.2.1Miikka Heikkinen2015-04-14479-1403/+2535
|\| | | | | | | Change-Id: I58fa595eee1cf9ab934cb3187981355d6a856d05
| * Add dist file for 1.2.1 and change version numbersMiikka Heikkinen2015-04-145-9/+18
| | | | | | | | | | Change-Id: Ia6bd240a8737fe9dbb6bf2d019cb032c7b60a874 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Copyright header changesMika Salmela2015-04-14471-1410/+1410
| | | | | | | | | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * qmlscatter example: Give a default size to the view itemCaroline Chao2015-03-111-0/+2
| | | | | | | | | | | | | | | | | | 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>
| * Qt 5.5 fixesTomi Korpipää2015-02-234-0/+1
| | | | | | | | | | Change-Id: I01260f9849340ea5cce2b5c00aa6c2c50192720c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Dust and H2 to galaxyMika Salmela2014-12-124-6/+158
| | | | | | | | | | Change-Id: I3bd3357fe73fbed68498311e0fd2a969980369a3 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Write fps to file.Mika Salmela2014-12-083-5/+39
| | | | | | | | | | Change-Id: I303c243b25da0003ca86e5085b913f54a14dc86f Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Fixes to galaxy.Mika Salmela2014-12-083-28/+58
| | | | | | | | | | Change-Id: I41a666177526db8563eee5799dee57e9994800dc Signed-off-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Improve button width setting on perf tester.Mika Salmela2014-12-041-4/+4
| | | | | | | | | | Change-Id: I1106cfbfca839d6af09a6cc505e2630ab2b9dc49 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Galaxy improvement.Mika Salmela2014-12-043-51/+48
| | | | | | | | | | Change-Id: I87ed53c41929e13e8d77236726b30dc5d89df077 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| * Initial version of Galaxy.Mika Salmela2014-12-048-0/+907
| | | | | | | | | | Change-Id: I29898bed342022290c8c8a6c4459969ffba3df56 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 23:52:18 +0000