Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Task-number: QTBUG-52953 Change-Id: Ie4cd46bf477d958394529cf7ca7b75c7455b1ce9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

Doc: Make documentation versioning follow .qmake.conf No reason to have hard-coded version numbers in .qdocconf, as they are available from env. variables. Change-Id: I4a118fe0127a20f01af157fbc496e3cb0ba69976 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

Add 5.7.0 changes file Change-Id: I72ac7ecf67786a2fe4491e848863367fdfd54c01 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Doc: Remove the additional "Getting Started" page Now that the addon is available under opensource license, there are less hurdles to install and use it. Change-Id: Ia8de9ca0f4034e4b5397a9f1a5ed218f068b193a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

Bump version to 2.1.1 Change-Id: If426ff4b1278b28afc7406fb42a7a6ad34aa725a Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Fix clearing the chart title Task-number: QTBUG-51725 Change-Id: Idf5c52052f385fb2d07201ac8844415a1b7841ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Fix crash when axis range is infinite. Now instead print out a warning and ignore the invalid range. Task-number: QTBUG-52320 Change-Id: I929f8f61eecaa23a0c61d143c5fa2e8431160d3f Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Merge remote-tracking branch 'origin/5.6.0' into 5.6 Change-Id: I69de781a63b4492ed7802e1d60b319d56a7bdd01

Fix compilation with GCC 6 qtcharts/tests/manual/chartwidgettest/mainwidget.cpp:211:74: error: call of overloaded ‘abs(double)’ is ambiguous newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100)); The file included <cmath>, but used C's math.h abs(), which is integer-only. ^ Change-Id: Iaa7e19f282a460a8c2d79475a14c7372b9740d26 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I79c74046eaf224235cc80a4323fefd2c083b007f Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Fix model resetting in with model mappers Change-Id: I22afd1d361aaf0561b4d94b6a3656bfe7b0d9812 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Fix crash with empty BarSet values Change-Id: I6c82ad2985f7efc501ed0df34b8205875a369fd0 Task-number: QTBUG-51287 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Fix crash when using linuxfb and 2D renderer No longer should call any OpenGL functions on QML charts applications if we don't have a valid OpenGL context. Task-number: QTBUG-51387 Change-Id: Ic393f69921e300f19dc42c83fc07677ce7869273 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: sync.profile Change-Id: Icdf61d347a6d0b3624867ceb8c1e4220c6c78a76

Explicitly update GLWidget when we set new points QOpenGLWidget was modified to not trigger some extra paint calls, which charts used to rely on, so now we do explicit updates instead. Change-Id: Ibe06c2f88ac7efe4e61351d582f2eff9d350f073 Task-number: QTBUG-51000 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Add support for showing tooltips when the legend text is truncated Change-Id: Ie0b90489eb51633a0294db12410f9056f740d086 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Add support for reversed axis when useOpenGL is true Change-Id: If8b6690585c767b65eaa4a43e179c86183903637 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Doc: Use a standard documentation config for a Qt module - Rename index.html to qtcharts-index.html - Use the qt-module-defaults global doc template - Convert 'indexes' into 'depends' - Remove custom buildversion string - Remove Q_INVOKABLE as ignore token, it's already listed in the global config - Use a namespace consistent with the rest of Qt modules - Update examplesinstallpath to the changes introduced in Qt 5.6 packaging. - Remove unnecessary \keyword on the landing page, as it may conflict with other modules' docs. Change-Id: I5cc0ff026b02bae22a415d82e36cb945bd19ae53 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>