summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable querying shadow support from graphsMiikka Heikkinen2014-03-0314-20/+57
| | | | | | | Also some example tweaking. Change-Id: If69e9d3617afc37b88fed4fd0e02ae19f0af7f78 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Disallow clearing all draw flagsTomi Korpipää2014-03-032-8/+32
| | | | | | | 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>
* Readme additionsMiikka Heikkinen2014-03-031-1/+2
| | | | | Change-Id: I98c5ff7bba0e7f28899c923c95900978acf7f8cc 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>
* New multi-window test appMiikka Heikkinen2014-02-287-1/+426
| | | | | Change-Id: Iff97d020ef6104d266dbc53931e44d494b415800 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-273-10/+11
| | | | | | | | | - Q3DObject - Q3DTheme Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DCamera doc and API updateTomi Korpipää2014-02-276-20/+20
| | | | | 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>
* Fix readmeMiikka Heikkinen2014-02-262-12/+6
| | | | | Change-Id: Ia363433235f7bc8b2ba98f097502f5bbbf4ef7b8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
* Doc: Made modifications to qdocconf file.Jerome Pasion2014-02-261-20/+12
| | | | | | | | | -to make it appropriate and compatible with the doc.qt.digia.com site. -enables cross-linking to qt-project.org/doc site. Change-Id: I311358fb7c03e0fd6db5bcdb5c39296c48e9dc0a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make graphs look nice in QML designerMiikka Heikkinen2014-02-261-1/+4
| | | | | | | | "Qml2Puppet" is the application name that runs the graph in QML designer, so we default to no item content in that case. Change-Id: Iee96dfd1398951239eb57104d976e27f3863733d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Example doc update Tomi Korpipää2014-02-261-3/+3
| | | | | | | | Task-number: QTRD-2635 Change-Id: I7f4b373d6c56fa40a8bfd82b2f03356b25227e40 Change-Id: I7f4b373d6c56fa40a8bfd82b2f03356b25227e40 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Context sharing disabled for mac only Tomi Korpipää2014-02-261-3/+3
| | | | | | Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263 Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Don't copy qmldir in android or iosMiikka Heikkinen2014-02-261-6/+7
| | | | | Change-Id: Ia2d05ad2a19bd37681facc17fc98ee14993ea639 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qmlsurfacelayers example docs updated Tomi Korpipää2014-02-262-2/+2
| | | | | | | | Task-number: QTRD-2635 Change-Id: I81990310b91ea68c30ea85f40eae1c2141be3380 Change-Id: I81990310b91ea68c30ea85f40eae1c2141be3380 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Android build fix Tomi Korpipää2014-02-261-1/+2
| | | | | | | | Task-number: QTRD-2903 Change-Id: I58a58a3c636331dc754183ceddb3d3ea49dfc2ed Change-Id: I58a58a3c636331dc754183ceddb3d3ea49dfc2ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix Valgrind found issuesMiikka Heikkinen2014-02-259-50/+64
| | | | | Change-Id: Iccacab527abf745e7ccd1e562ff9ea5dea4c8005 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Specifics.qml bug fix Tomi Korpipää2014-02-253-6/+6
| | | | | | | | Task-number: QTRD-2851 Change-Id: I723a9332c1816936d3538d1719adfefd4ecd880b Change-Id: I723a9332c1816936d3538d1719adfefd4ecd880b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Specifics.qml update Tomi Korpipää2014-02-253-12/+54
| | | | | | | | Task-number: QTRD-2851 Change-Id: I8f8c547855dd530bacc40efeedcb0e10bddf6f17 Change-Id: I8f8c547855dd530bacc40efeedcb0e10bddf6f17 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move selection labels to renderer from render itemsMiikka Heikkinen2014-02-2412-122/+148
| | | | | | | | | | | | Creating a new label on demand is fast enough, so we don't need to store old labels. Storing labels unnecessarily leads to unchecked use of graphics memory. Optimized bar slices a bit by having separate class of render items for slice items. Change-Id: I5afdecfb3949393341b6c3eaefbc667c65da32e3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* qmlsurface snapshot updated Tomi Korpipää2014-02-241-0/+0
| | | | | | | | Task-number: QTRD-2635 Change-Id: I7cd1eda688800f010f4647420ed91ac4dbc06407 Change-Id: I7cd1eda688800f010f4647420ed91ac4dbc06407 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qmlsurface visual tweaks Tomi Korpipää2014-02-241-14/+12
| | | | | | Change-Id: I534ae16cb79cfdfecc8bb6a227879d2d8bfcf4ae Change-Id: I534ae16cb79cfdfecc8bb6a227879d2d8bfcf4ae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* qmlcustominput snapshot updated Tomi Korpipää2014-02-241-0/+0
| | | | | | | | Task-number: QTRD-2635 Change-Id: If7f0583c3227650f7b3bdb942a863221bfb0158e Change-Id: If7f0583c3227650f7b3bdb942a863221bfb0158e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* qmlcustominput tweak Tomi Korpipää2014-02-242-5/+39
| | | | | | Change-Id: I9b251aca364928bbee64d8aa5d4397bbb0a20872 Change-Id: I9b251aca364928bbee64d8aa5d4397bbb0a20872 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Set objects dirty on Y axis range changeMika Salmela2014-02-242-1/+15
| | | | | | | Task-number: QTRD-2889 Change-Id: Iac92a50b6454d8e83ece984a13a0bcfa1f908d9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qmlsurface snapshot updated Tomi Korpipää2014-02-241-0/+0
| | | | | | | | Task-number: QTRD-2635 Change-Id: I0603408b49d4bd1a8d3572742c5a6dbc106c7fa3 Change-Id: I0603408b49d4bd1a8d3572742c5a6dbc106c7fa3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove unneeded transparency from qmlmultigraph RectanglesMiikka Heikkinen2014-02-242-6/+1
| | | | | Change-Id: Ibbabc5e69beb0066f49ed4bc3fa3406ce89e1a35 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Don't do unnecessary polygon fill enablingsMiikka Heikkinen2014-02-241-6/+4
| | | | | Change-Id: I7111837454e901dc44a7aaf094f1762dcf14455c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed unnecessary overloaded function Tomi Korpipää2014-02-242-10/+0
| | | | | | Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98 Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix the variable naming in findMatchingRowMiikka Heikkinen2014-02-242-6/+6
| | | | | | | Y -> Z Change-Id: I793b956212ba51c523f965c5f99db250d0cac1cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Improve antialiasing & msaaSamples handling in qmlMiikka Heikkinen2014-02-242-37/+40
| | | | | | | + Make sure we don't crash if old window gets destroyed Change-Id: I037e0bb29284aad1dd37da6fcb6a0839bac962e0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Kinect demo compilation fix Tomi Korpipää2014-02-212-2/+2
| | | | | | Change-Id: Ic50a84edff5775e724a0ccaf32626f971a346be9 Change-Id: Ic50a84edff5775e724a0ccaf32626f971a346be9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix qmlsurfacelayers render mode button for androidMiikka Heikkinen2014-02-211-5/+12
| | | | | Change-Id: Ib9d042a3f1176b710bfafcb5da16856fb5c1bc7d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed retina problems with FBO renderingTomi Korpipää2014-02-212-3/+4
| | | | | | | Task-number: QTRD-2890 Change-Id: I9cd5de30dd58b78adc0e065742ed689f16b630f1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for selection pointerMika Salmela2014-02-215-54/+148
| | | | | | | Task-number: QTRD-2515 Change-Id: Id3611533c4dd333b68b96669c7230707506b68ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Re-enabled background rendering to qmlsurfacelayers Tomi Korpipää2014-02-211-1/+1
| | | | | | Change-Id: I1530716751b44f1d9d4edd19d8862c186ac7fb3d Change-Id: I1530716751b44f1d9d4edd19d8862c186ac7fb3d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac fixes for QMLTomi Korpipää2014-02-212-3/+13
| | | | | Change-Id: I9598b83985aee3bbdf006f317bcc00ba95027569 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Misc fixesMiikka Heikkinen2014-02-2111-60/+53
| | | | | | | | | + Rectangle used as main item in qml examples to make ui consistent + Surface autoaxis adjustment fixes for multiseries case + Qmlsurface example UI tweaks Change-Id: Ie75b0efc08f9a56ca709f079b28865e34caa8641 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>