Fix documentation generated against Qt5 The image files that are not referenced in any qdoc file are not defined as extraimages separately for both Qt4 and Qt5. There are still warnings of deprecated markup commands when generating the documentation against Qt5 but the documentation itself now looks good. Task-number: QTRD-1908 Change-Id: I5bb1ac4ce1899bcde99c42180bd2f3e715b9151a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Add HTML support for pie slice labels Added possibility to use HTML tags with the pie slice labels. Task-number: QTRD-2186 Change-Id: I987cc1bde8fe367b7fcf2cee7037643ad93c3061 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Add new Qt theme template Added new theme template ChartThemeQt. The colors are the ones used in official Qt documentation. Task-number: QTRD-1924 Change-Id: I2bb2d33b0198cad6275244d2e815908a2db033a3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix Charts build with QT_NO_GRAPHICSEFFECT definition QGraphicsDropShadowEffect class can't be used when QT_NO_GRAPHICSEFFECT is defined. Therefore the ChartBackground::setDropShadowEnabled() does nothing with the aforementioned definition. Also the ChartBackground::isDropShadowEnabled() method then always returns false. Task-number: QTRD-2356 Change-Id: I0ef2cec082e8b0dc15756312da61ce773b8d405f Reviewed-by: Karim Pinter <karim.pinter@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix Chart build when QT_NO_RUBBERBAND is defined No rubber band is set for the QChartView if QT_NO_RUBBERBAND is defined. A warning will be fired in case one tries to set the rubber band and Qt is configured without the it. Task-number: QTRD-2240 Change-Id: I6259726077e39f143e317e1b1b13a1daa2a0c1e0 Reviewed-by: Karim Pinter <karim.pinter@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Do not add tests to subdirs if it doesn't exist. Facilitates release package creation - no need to edit charts.pro manually when creating the package anymore. Change-Id: I25ec7d762f465d93591ac77320c10a1e3ff6d761 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Update the git-archive export options The .gitattributes, .gitignore, .commit-template files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store the SHA-1 of the commit being packaged. Also removing 'tests' and 'tools' directories from the source package. Change-Id: I6823bad4ee4a5a666532e972a66da075856d5fee Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix Chart build when QT_NO_TEXTSTREAM is defined If QT_NO_TEXTSTREAM is defined the operator<< can't be used. It's safe to flag out the streaming operator debug information because the function itself can't be used when QT_NO_TEXTSTREAM is defined. Task-number: QTRD-2336 Change-Id: I2d64f4dd03bf65e7ae0e07f4916f245bc71a7458 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Remove qmlcustommodel demo from demos.pro Remove the qmlcustommodel also from demos.pro Task-number: QTRD-1928 Change-Id: Ifd0764ff2381452054005743935910dee2451520 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Remove qmlcustommodel demo Qml Custom Model demo removed for now. If there's need for similar demo in the future a better one should be created. Task-number: QTRD-1928 Change-Id: I1766dfca4e2a7358f47c40f0e0b7258768c16b22 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix legend truncation Legend marker items that are on a legend which is positioned on the top or on the bottom of a chart are truncated to fit the space available. The truncation starts at the longest legend marker item. Task-number: QTRD-2092 Change-Id: I22581b4447591fda11adab3873553cd5ee3dc001 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix compiler errors when including Windows.h The Windef.h (included by Windows.h) defines min and max macros. These conflict with QBarCategoryAxis::min() and max() functions. Defining NOMINMAX suppresses the min and max definitions in Windef.h. Task-number: QTRD-2285 Change-Id: Iff797f8c3ff00a582e600db281f0f79930d7b49a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix text color for debug information Debug information is drawn with a gray pen so that it can be seen with all current chart themes. Task-number: QTRD-2326 Change-Id: I32da226e5ae834ff9b3088ef5fac72e85610508f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix default axes creation QAbstractAxis::AxisType enum values are currently sequential so it's not possible to OR them correctly. Therefore createDefaultAxes() needs to check whether there are series with different types present. For multiple series types the QAbstractAxis::AxisTypeNoAxis type is used to indicate the need for several axes. The createDefaultAxis() methods have been corrected to return proper values. Task-number: QTRD-1999 Change-Id: I3408bd3043b147f9e2b7662fb4d9ca43e7a72da6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix Chart build on Solaris The sine and the square root methods in demos and examples have been replaced with the ones provided by Qt. This ensures that the code compiles also on Solaris. Task-number: QTRD-2262 Change-Id: I776341bac0e623f803b4cad771a02cefc6db1b15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com>

Add example of using image as a brush for scatter series The ScatterChart Example is modified so that it shows how to use an image as a brush for scatter series. The image is a star and it's created using QPainterPath. Task-number: QTRD-2078 Change-Id: Ie92ad56efafaf12af2efe4424be63060f812f9e2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix logarithmic axis point calculation For logarithmic axis the geometry point is set even if the point value is zero or negative. For zero and negative values the x-point is set to zero and the y-point is set to chart height. This way the bar chart items can ignore the return value from calculateGeometryPoint() method and not draw the bar for a value that does not have logarithm defined. Task-number: QTRD-2065 Change-Id: I7ba4efed6a0678eb487377e3e88bdee9c849a9a3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Doc: language review of Qt Charts doc Change-Id: I6bdf7b64851d1f0e2b98f37cbf9844aeb205bed1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix mouse event handling with RubberBand The mousePressEvent handles the event differently for rubber band only if the mouse press occurs on the plot area. This way pressing the mouse outside plot area will handle the event according to the pressed item (like legend marker). For the same reason the mouseRelease event handles the event differently for rubber band only if the rubber band is displayed. Task-number: QTRD-2260 Change-Id: Ibedcd2d13a7c2229352074a4df326cd73e9cf80f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Fix setting the axis title The axis title text needs to be set in the ChartAxisElement only if the new title is empty or the title is hidden. In other cases the title will be set in updateGeometry() of the axis. Removed redundancy of setting title information. The title information needs to be set only once when creating items for axis. Task-number: QTRD-2104 Change-Id: Ie29c94215bdbab412a3dbb8368309abbd15aa4d1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>