summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/qitemmodelsurfacedataproxy.h
Commit message (Collapse)AuthorAgeFilesLines
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-261-7/+7
| | | | | Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-22/+22
|\ | | | | | | | | | | | | Conflicts: src/datavisualization/utils/qutils.h Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-031-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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>
* | Copyright file update to GPLMiikka Heikkinen2016-01-121-9/+17
|/ | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-201-11/+14
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fix building against 5.6Miikka Heikkinen2015-06-171-1/+1
| | | | | | | | 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>
* Copyright header changesMika Salmela2015-04-141-3/+3
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Change copyright headers.Miikka Heikkinen2014-11-071-7/+7
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix QML item model crashes Tomi Korpipää2014-06-021-11/+13
| | | | | | | | | | | Needed to allow using charts and data visualization from the same application. Low-impact binary break Change-Id: I4b82e540b202e18e2e7a4278d06c9e9f43001a8f Change-Id: I4b82e540b202e18e2e7a4278d06c9e9f43001a8f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multi-match behavior implementation for surface item model proxyMiikka Heikkinen2014-05-141-0/+13
| | | | | | Task-number: QTRD-3074 Change-Id: I2dc67f0c524bce87498129bbc462bd8f014b8d2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable mapping single role to multiple properties for surfaceMiikka Heikkinen2014-05-121-0/+43
| | | | | | | Task-number: QTRD-3074 Change-Id: If40de067526b6f24b3e55bf64ed804a79d473e5f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-9/+9
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface mappingMiikka Heikkinen2014-01-311-8/+26
| | | | | | | Task-number: QTRD-2528 Change-Id: I2e677519b08d1a634d5024ecc85d82b74f8587ad Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-271-1/+1
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reintroduced namespace macros Tomi Korpipää2014-01-161-2/+2
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-2/+2
| | | | | | | | | - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* move connectItemModelHandler() from public proxies to privateMiikka Heikkinen2013-12-031-1/+0
| | | | | | | Task-id: QTRD-2672 Change-Id: I64983784e600fb4e21d7d51a2099b1f57bd8fc0f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Integrated item model mappings to item model proxiesMiikka Heikkinen2013-11-271-11/+59
| | | | | | | | Separate mapping object was redundant. Task-number: QTRD-2564 Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Module renamedTomi Korpipää2013-09-101-0/+62
Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>