summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Actually use axis formatter in renderer.Miikka Heikkinen2014-03-2522-832/+579
| | | | | | | Task-number: QTRD-2787 Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Introduce value axis formatterMiikka Heikkinen2014-03-2418-69/+860
| | | | | | | | | | | | | Currently only used for label formatting. Also some other preparatory changes for logaxis. Task-number: QTRD-2787 Note: Not to be merged until 1.0 is released Change-Id: I2d7ab70b9c51677d0edd5b0226fb779c9e346286 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* User-defined mesh glimmer fix Tomi Korpipää2014-03-241-0/+4
| | | | | | | | Task-number: QTRD-2648 Change-Id: Ibde745807609dab069d93e7cc9b4d4d547fff6f1 Change-Id: Ibde745807609dab069d93e7cc9b4d4d547fff6f1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Use GL_LINES for ES2 grid linesTomi Korpipää2014-03-249-70/+215
| | | | | | | | Task-number: QTRD-2527 Change-Id: I08b9c740f6dfaf8107601cfc1e7e53db13bf8268 Note: Not to be merged until 1.0 is released Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for rendering to image Tomi Korpipää2014-03-247-3/+80
| | | | | | | | | | Task-number: QTRD-2869 Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853 Note: Not to be merged until v1.0 is out Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added info about binary package to docsTomi Korpipää2014-03-212-3/+36
| | | | | Change-Id: I49235bcfcd41976e272d5cbcf3f9bc3f9794138c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix iOS empty graph problemTomi Korpipää2014-03-191-0/+10
| | | | | | | Task-number: QTRD-2956 Change-Id: I5ec52d70ca4d2e77d219af5b9909967123df6357 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed bars slice label problem with grid offKorpipää Tomi2014-03-181-5/+4
| | | | | | | Task-number: QTRD-2950 Change-Id: Icab3ed5279c671b57921f93c9ffef7efff2da204 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix surface slice problem on MacMika Salmela2014-03-172-1/+24
| | | | | | | Separate shader for slice surfaces. Change-Id: I29f89dc718a4a5dde8d78e1f602283889087bf23 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add proper scoping to signals with enum parametersMiikka Heikkinen2014-03-177-11/+11
| | | | | | | | | According to customer feedback, the lack of proper scoping makes it impossible to use the traditional style SIGNAL() macro when making connections. Change-Id: I3fbead5400bbd8b5fad62e4facecc6610c36c9a6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection label skewing fixed Tomi Korpipää2014-03-141-7/+7
| | | | | | Change-Id: I13b06175a1be0eb92acd7c1aac2ea860e02d6fac Change-Id: I13b06175a1be0eb92acd7c1aac2ea860e02d6fac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* SelectionMode as combination of checkboxesTomi Korpipää2014-03-132-40/+292
| | | | | Change-Id: I30f697ae3f94258717f01b34813dc7fd66c2485c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix target name for mac bundle buildsMika Salmela2014-03-111-2/+7
| | | | | | Change-Id: I34a0ca6be021e3acd22d2ec2079ff73c96f470e0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Property type fixesMika Salmela2014-03-072-7/+7
| | | | | | Change-Id: I43d9a3b27cf76a8d9b80b102705ab25c7bb7636c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix examples docs for creatorMiikka Heikkinen2014-03-072-28/+31
| | | | | Change-Id: I847d6f506559f0935ea9703ea5fae93a8b3af8d2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* ItemModelBarDataProxy property type fixesMika Salmela2014-03-061-6/+6
| | | | | Change-Id: I0f4f62bdb89067ac142164afb66dbfc481e72bc2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* barThickness tweak Tomi Korpipää2014-03-061-4/+4
| | | | | | Change-Id: I7180b0348ee2e006f3e9727f8686cf7628e6df48 Change-Id: I7180b0348ee2e006f3e9727f8686cf7628e6df48 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Readability improvementMika Salmela2014-03-061-2/+2
| | | | | Change-Id: I77f2b488b44eb1d985bdb6985b979f46bba04085 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Adding support for barThickness and barSpacing again.Thomas Hartmann2014-03-061-0/+40
| | | | | | | | | The barSpacing property barSpacing is rounded to integers, but this is fixed by: https://codereview.qt-project.org/#change,79968 Change-Id: I39844ccfa90c4aa344c05bc87d6039fcf3836cb0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixing the enum scopes for the comboboxes.Thomas Hartmann2014-03-063-0/+9
| | | | | | | | Warning: This does require Qt Creator 5.1, but I think Qt Creator 5.1 should be a requirement. Change-Id: I2783d28618bfdf468cb1ab8ee9d2268894364fa7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove obsolete property documentationMika Salmela2014-03-051-6/+0
| | | | | Change-Id: Ice8ea6f8ce26cdd77d52c71d9e6b14c91e52c57c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Changing float to doubleThomas Hartmann2014-03-051-33/+33
| | | | | | | | | | | | QmlDesigner has a problem handling "float". This will be fixed, but as a workaround we just change float to double. The code model does not differentiate between float and double. Change-Id: If5802efdb501c24194cd758e0a10612c2c5e630b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Adding plugins.qmltypesThomas Hartmann2014-03-052-0/+1390
| | | | | | | | This file is required for the Qt Creator code model. Change-Id: Ie0480751841aae59c2df7ae9b0470d5e068257e1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Actual icons for designer Tomi Korpipää2014-03-056-0/+0
| | | | | | Change-Id: I5ab858067d3fc921b9574d1d0dd1ca4987e6e251 Change-Id: I5ab858067d3fc921b9574d1d0dd1ca4987e6e251 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make bar graph horizontal labels transparent to vertical labelsMiikka Heikkinen2014-03-051-63/+64
| | | | | Change-Id: Ie86f773551fe798b8476d3947e2b9d88bbe3855c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make sure we don't draw empty graphs in designerMiikka Heikkinen2014-03-052-3/+5
| | | | | Change-Id: I90dac0c7c884326875dd4b58d71075fd316e47b8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Default graphs for qmldesignerMiikka Heikkinen2014-03-046-10/+131
| | | | | | | +Some doc changes Change-Id: Id815f178e3321c6033f6782d75a99b54c656ca7a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix category axis automatic range adjustment for simple bar graphsMiikka Heikkinen2014-03-041-2/+2
| | | | | | | Single row/column graphs added extra row when autoadjusting. Change-Id: Ie6b79257c33cbf4647fe4855e8cbc655052a133c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minimal qml surface example bug fix Tomi Korpipää2014-03-041-1/+1
| | | | | | Change-Id: Ib1598adbf906ba13bf538981abdd60fe0fda2e2c Change-Id: Ib1598adbf906ba13bf538981abdd60fe0fda2e2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Specifics typo bug fix Tomi Korpipää2014-03-043-6/+6
| | | | | | Change-Id: I19c1bec9a7c562d3bcd510ba7faa20a0773eb6a5 Change-Id: I19c1bec9a7c562d3bcd510ba7faa20a0773eb6a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added default size to designer components Tomi Korpipää2014-03-041-0/+9
| | | | | | Change-Id: I5aa7f75aafd3437c1f5389b3ffbbb47cdde02d8e Change-Id: I5aa7f75aafd3437c1f5389b3ffbbb47cdde02d8e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed designer properties that do not work yet Tomi Korpipää2014-03-041-40/+0
| | | | | | | | Made a jira task to put them back once the issue has been fixed Change-Id: I4fbd40a739b7cf811d20f511ec0d870a676c0b7c Change-Id: I4fbd40a739b7cf811d20f511ec0d870a676c0b7c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enable querying shadow support from graphsMiikka Heikkinen2014-03-037-0/+35
| | | | | | | Also some example tweaking. Change-Id: If69e9d3617afc37b88fed4fd0e02ae19f0af7f78 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Disallow clearing all draw flagsTomi Korpipää2014-03-031-4/+16
| | | | | | | Task-number: QTRD-2907 Change-Id: I89a45971bf67c533ecfe477cd685812c46574dd8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Round viewport to nearest integerMika Salmela2014-03-031-4/+5
| | | | | | | | Task-number: QTRD-2905 Change-Id: I4a922544c72fede663379e19c49f31de77c6a767 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove the invalid renderer deletion from context switch.Miikka Heikkinen2014-03-031-17/+4
| | | | | | | | Multiwindow case is still broken, though. Added note to code about it. Change-Id: Iec381d362469a8b2cf998c52f807b5c855526b22 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac shared context bug fixTomi Korpipää2014-02-281-8/+8
| | | | | Change-Id: I3c3865eca8c2aadbb1de871e477f29495244b5a4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac compilation fixTomi Korpipää2014-02-283-6/+8
| | | | | Change-Id: I9203e511d9d50af4d7bb2127af790df4c74fa9b2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Compilation warning fix Tomi Korpipää2014-02-281-1/+1
| | | | | | Change-Id: Id69075897ae4e4fe5ce0c6e8f1f4f904b4ab44f1 Change-Id: Id69075897ae4e4fe5ce0c6e8f1f4f904b4ab44f1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Introduce state storing for mac and android.Miikka Heikkinen2014-02-2810-24/+1033
| | | | | | | | | | | | At least some mac and android environments do not handle shared contexts properly, leading to slowdowns and/or artifacts. Disable context sharing on mac and android, and instead store and restore relevant opengl state. Also improve renderer and context cleanup Change-Id: I8fa596b95f6ff20d53c950a34b5c28513acbc18f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed touch selection bugTomi Korpipää2014-02-281-2/+5
| | | | | | | Task-number: QTRD-2904 Change-Id: Ia6a0de9fd8a6b3cd42bd6512227033218162b2c0 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Doc fixes: Tomi Korpipää2014-02-277-24/+27
| | | | | | | | | | | | | - QValue3DAxis - QItemModelScatterDataProxy - QItemModelSurfaceDataProxy - QScatterDataProxy - QSurface3DSeries - QSurfaceDataProxy Change-Id: If94fef980c96d4e34a5034ba93f3ac676d479f05 Change-Id: If94fef980c96d4e34a5034ba93f3ac676d479f05 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix some docsMiikka Heikkinen2014-02-272-2/+1
| | | | | Change-Id: I468611f1cf9d130bc2b5bcba63e24a2fafecbaca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc fixes: Tomi Korpipää2014-02-274-24/+27
| | | | | | | | | | | - QCategory3DAxis - QBarDataProxy - QHeightMapSurfaceDataProxy - QItemModelBarDataProxy Change-Id: I021af6e0b52a6cc0b8068784406c3422e45640e1 Change-Id: I021af6e0b52a6cc0b8068784406c3422e45640e1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc fixes Tomi Korpipää2014-02-274-26/+26
| | | | | | | | | | | - QAbstract3DAxis - QAbstract3dSeries - QAbstract3DGraph - QAbstract3DInputHandler Change-Id: Ida248755523fb3de7d2f9dfda274429200525737 Change-Id: Ida248755523fb3de7d2f9dfda274429200525737 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc fixes Tomi Korpipää2014-02-272-8/+9
| | | | | | | | | - Q3DObject - Q3DTheme Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DCamera doc and API updateTomi Korpipää2014-02-273-11/+11
| | | | | Change-Id: Id33645c7f921ad7289c2e368a656ee1c7b2d69ea Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix some copyrightsMiikka Heikkinen2014-02-264-18/+14
| | | | | Change-Id: I97e4bd37243ae94ce4537ee849fd11ee59a570bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added multimedia to qdocconf Tomi Korpipää2014-02-261-1/+2
| | | | | | Change-Id: I9a87aba727c9625f4c3b4b17334654ba96425331 Change-Id: I9a87aba727c9625f4c3b4b17334654ba96425331 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed obsolete lines from qdocconf Tomi Korpipää2014-02-261-4/+0
| | | | | | Change-Id: I4270b196a98e298a459a0fa768d62ad28dec659d Change-Id: I4270b196a98e298a459a0fa768d62ad28dec659d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>