Updated Charts version and README file for release

Updated Charts version to 1.4.0 and updated README accordingly.

Task-number: QTRD-3088
Change-Id: I4f2f3ef0874dce8a6c38e9ecb7b1b253481e1445
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

6 files changed, 32 insertions, 37 deletions

diff --git a/README b/README
index 7746e14c..3d73b5dd 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 ----------------------
-Qt Charts Add-on 1.3.1
+Qt Charts Add-on 1.4.0
 ----------------------
 
 What's in Qt Charts
@@ -79,41 +79,36 @@ if you want to do it yourself. Creating the documentation using Qt4 also works,
 pages are not generated correctly, such as the 'List of All Members' page for all C++ and
 QML APIs in .qch documentation.
 
-Main Changes between 1.3.0 and 1.3.1
+Main Changes between 1.3.1 and 1.4.0
 ====================================
 
-- New Qt theme template added
+- New: Added possibility to set brush image for AreaSeries, BarSet, BoxPlotSeries,
+    BoxSet, PieSlice and ScatterSeries by specifying 'brushFilename'
+- New: Added possibility to show series point values for line, spline and scatter series
+- New: Added possibility to position the bar value labels
 
 Bug Fixes and minor new features
 ================================
 
-- New: Added new hovered signal for bar charts with index information
-- New: Added example of using dynamically generated image as a brush for scatter series
-- New: Added HTML support for pie slice labels
-- New: Added possibility to build Charts without demos and examples
-- Fixed: Theme initialization performance for bar series is improved
-- Fixed: Documentation generated against Qt5
-- Fixed: Pie chart label is truncated if there's not enough space for the label
-- Fixed: Legend item truncation to start with the longest item
-- Fixed: Vertical and horizontal truncation of labels in bar chart
-- Fixed: Dynamic qml axis switch
-- Fixed: Crash with empty QAreaSeries
-- Fixed: Missing legend when printing a chart that is not shown
-- Fixed: Crash when zooming
-- Fixed: Chart geometry calculated only for visible items
-- Fixed: Alignment for multiline items
-         - Alignment can be set for multiline items using format:
-           "<p align=\"center\">multiline<br\>item</p>"
-- Fixed: Removed redundancy when setting the axis title
-- Fixed: Mouse event handling with rubber band
-- Fixed: logarithmic axis point calculation for zero and negative values
-- Fixed: Chart build on Solaris
-- Fixed: Axis creation with createDefaultAxes() when series of different types are present
-- Fixed: Debug information text color changed to gray to make it visible with all themes
-- Fixed: Min and max conflict with standard macros on Windows
-- Fixed: Chart build with QT_NO_TEXTSTREAM definition
-- Fixed: Chart build with QT_NO_RUBBERBAND definition
-- Fixed: Chart build with QT_NO_GRAPHICSEFFECT definition
+- New: Added count property for QBoxPlotSeries
+- New: Added option to set markers in legend in reverse order
+- New: Install the plugins.qmltypes file for Qt Quick 2 requested by Qt Creator
+- New: Added clear function for BarCategoryAxis
+- Fixed: Assert failure with percent bar series zero values
+- Fixed: Updated files generated with Qt Creator for demos
+- Fixed: DeclarativeChart::legend property marked as constant
+- Fixed: Crash with ScatterChartItem mouse events
+- Fixed: Build for iOS and for building the QtQuick2 plugin statically
+- Fixed: Setting values for BarSet using Qt.point
+- Fixed: Bar category rendering for empty category
+- Fixed: QBoxSet color setting
+- Fixed: Mouse event handling for pie
+- Fixed: Legend truncation
+- Fixed: Scatter series color
+- Fixed: Crash in ChartDataSet::attachAxis()
+- Fixed: Added missing library directory
+- Fixed: Added Charts directory to include path
+- Fixed: NOMINMAX definition
 
 Known issues
 ============
diff --git a/charts.pro b/charts.pro
index c9bf56c6..b16930b8 100644
--- a/charts.pro
+++ b/charts.pro
@@ -20,8 +20,8 @@ feature.files = $$PWD/features/qtcommercialchart.prf
 INSTALLS += feature
 
 # docs
-CHARTS_VERSION = 1.3.1
-CHARTS_VERSION_TAG = 131
+CHARTS_VERSION = 1.4.0
+CHARTS_VERSION_TAG = 140
 
 contains(QT_MAJOR_VERSION, 5) {
     QDOC_CONFFILE = qcharts-qt5.qdocconf
diff --git a/doc/docconf/qcharts.qdocconf b/doc/docconf/qcharts.qdocconf
index ade24c7b..9d2bd7a1 100644
--- a/doc/docconf/qcharts.qdocconf
+++ b/doc/docconf/qcharts.qdocconf
@@ -1,6 +1,6 @@
 project = Qt Charts
 description = Library for creating charts
-version = 1.3.1
+version = 1.4.0
 
 sourcedirs = ../../src \
              ../../examples \
diff --git a/doc/src/gettingstarted.qdoc b/doc/src/gettingstarted.qdoc
index 081a7b94..7de708d7 100644
--- a/doc/src/gettingstarted.qdoc
+++ b/doc/src/gettingstarted.qdoc
@@ -64,7 +64,7 @@
 
     Add an import line to your *.qml file:
     \code
-    import QtCommercial.Chart 1.3
+    import QtCommercial.Chart 1.4
     \endcode
 
     \raw HTML
diff --git a/doc/src_qt5/qmlmodule.qdoc b/doc/src_qt5/qmlmodule.qdoc
index e8476c19..b909cb58 100644
--- a/doc/src_qt5/qmlmodule.qdoc
+++ b/doc/src_qt5/qmlmodule.qdoc
@@ -1,3 +1,3 @@
 /*!
-    \qmlmodule QtCommercial.Chart 1.3
+    \qmlmodule QtCommercial.Chart 1.4
 */
diff --git a/src/qchartglobal.h b/src/qchartglobal.h
index f34e5a48..33f09784 100644
--- a/src/qchartglobal.h
+++ b/src/qchartglobal.h
@@ -23,11 +23,11 @@
 
 #include <qglobal.h>
 
-#define QTCOMMERCIALCHART_VERSION_STR   "1.3.1"
+#define QTCOMMERCIALCHART_VERSION_STR   "1.4.0"
 /*
    QTCOMMERCIALCHART_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QTCOMMERCIALCHART_VERSION       0x010301
+#define QTCOMMERCIALCHART_VERSION       0x010400
 /*
    can be used like #if (QTCOMMERCIALCHART_VERSION >= QTCOMMERCIALCHART_VERSION_CHECK(1, 1, 0))
 */