Merge branch 'develop'

Conflicts:
	.qmake.conf
	README
	src/datavisualization/global/qdatavisualizationglobal.h

Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11

1 files changed, 12 insertions, 11 deletions

diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index af419814..b07074b1 100644
--- a/src/datavisualization/doc/src/qtdatavisualization.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc
@@ -37,7 +37,7 @@
 */
 
 /*!
-    \qmlmodule QtDataVisualization 1.1
+    \qmlmodule QtDataVisualization 1.2
     \title Qt Data Visualization QML Types
     \ingroup qmlmodules
 
@@ -98,7 +98,7 @@
     \row
       \li Windows (MSVC)           \li nmake
     \row
-      \li OSX                      \li make
+      \li OS X                     \li make
     \endtable
 
     The above generates the default makefiles for your configuration, which is typically
@@ -127,7 +127,7 @@
     make release
     \endcode
 
-    For both builds (Windows/Mac only):
+    For both builds (Windows/OS X only):
     \code
     qmake CONFIG+="debug_and_release build_all"
     make
@@ -323,20 +323,21 @@
     \title Qt Data Visualization Known Issues
 
     \list
-        \li Android doesn't support both widgets and OpenGL simultaneously, so only
-            the Qt Quick 2 API is usable in practice in Android.
+        \li Some platforms like Android and WinRT cannot handle multiple native windows properly,
+            so only the Qt Quick 2 graphs are available in practice for those platforms.
         \li Shadows are not supported with OpenGL ES2 (including Angle builds in Windows).
         \li Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows).
+        \li QCustom3DVolume items are not supported with OpenGL ES2 (including Angle builds in
+            Windows).
         \li Surfaces with non-straight rows and columns do not always render properly.
         \li Q3DLight class (and Light3D QML item) are currently not usable for anything.
-        \li Changing any of Q3DScene properties affecting subviewports currently has no effect.
-        \li The color style Q3DTheme::ColorStyleObjectGradient doesn't work for surface graphs.
+        \li Changing most of Q3DScene properties affecting subviewports currently has no effect.
         \li Widget based examples layout incorrectly in iOS.
         \li Reparenting a graph to an item in another QQuickWindow is not supported.
-        \li There is a low-impact binary break between 1.0 and 1.1. The break is due to a QML type
-            registration conflict with QAbstractItemModel between QtDataVisualization and
-            QtCommercial.Charts. Introducing the binary break makes it possible to use both
-            Charts and Data Visualization in the same QML application.
+        \li Android builds of QML applications importing QtDataVisualization also require
+            "QT += datavisualization" in the pro file. This is because Qt Data Visualization
+            QML plugin has a dependency to Qt Data Visualization C++ library, which Qt Creator
+            doesn't automatically add to the deployment package.
     \endlist
 */