summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-14 10:52:29 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-14 11:04:33 +0300
commit2240de43294ec080d8aa665c7a0731ea81ea6c1f (patch)
tree29eefbe3d568ae774dd1d398aab4b6b39cf04c54
parent013014de4ae4f95bfc142ed23dd4492886e6bc7e (diff)
Update version and readme for TP
Change-Id: I274763306a08489bd91950ce127aae19a7d2ce36 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--.gitattributes5
-rw-r--r--.qmake.conf4
-rw-r--r--.tag1
-rw-r--r--README61
-rw-r--r--dist/changes-0.1.01
-rw-r--r--dist/changes-1.0.00
-rw-r--r--src/datavisualization/datavisualization.pro7
-rw-r--r--src/datavisualization/doc/qtdatavisualization.qdocconf10
-rw-r--r--src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp2
-rw-r--r--src/datavisualization/global/qdatavisualizationglobal.h6
10 files changed, 85 insertions, 12 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..7709f882
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+.tag export-subst
+.gitignore export-ignore
+.gitattributes export-ignore
+.commit-template export-ignore
+tests export-ignore
diff --git a/.qmake.conf b/.qmake.conf
index cee97767..213e6914 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,2 @@
-MODULE_VERSION=5.1.0
-load(qt_build_config) \ No newline at end of file
+MODULE_VERSION=0.1.0
+load(qt_build_config)
diff --git a/.tag b/.tag
new file mode 100644
index 00000000..6828f88d
--- /dev/null
+++ b/.tag
@@ -0,0 +1 @@
+$Format:%H$
diff --git a/README b/README
index e69de29b..f450b8b8 100644
--- a/README
+++ b/README
@@ -0,0 +1,61 @@
+-------------------------------------------------
+Qt Data Visualization 0.1.0 (Techonology preview)
+-------------------------------------------------
+
+Qt Data Visualization module provides multiple graph types to visualize data in 3D space
+both with C++ and Qt Quick 2.
+
+System Requirements
+===================
+
+- Qt 5.1 or newer
+- OpenGL 2.1 or newer (recommended) or OpenGL ES2 (reduced feature set)
+
+Building
+========
+Configure project with qmake and build project with make:
+ (Linux) make
+ (Windows with MinGw) mingw32-make
+ (Visual Studio) nmake
+ (OSX) make
+
+If you want to install the module to your Qt directory use:
+ make install
+
+If you want to uninstall the module
+ make uninstall
+
+Building as a statically linked library
+=======================================
+
+The same as above applies you will just have to add static to the CONFIG:
+ qmake CONFIG+=static
+
+Documentation
+=============
+Pregenerated documentation can be found from doc folder for both Qt Assistant
+(qtdatavisualization.qch) and in HTML format (qtdatavisualization subfolder).
+
+The documentation can also be generated with:
+ make docs
+
+Please refer to the generated documentation for more information:
+ doc/qtdatavisualization/qtdatavisualization-index.html
+
+Known Issues
+============
+
+The technology preview version is still missing some features entirely, while some
+others may be only partially implemented. Here are some known issues:
+
+- Scatter graphs can only show zero centered axis ranges properly.
+- Value axis range of a bar graph with negative values need to be zero
+ centered to display properly.
+- Selection API is missing for surface graphs.
+- Shadows do not work for surface graphs.
+- Mac: Graphs drawn half the size on Retina displays.
+- Using multiple graphs in one application crashes on application shutdown
+ unless the last graph to have active context is deleted last.
+- Android doesn't support both widgets and OpenGL simulataneously, so only
+ the Qt Quick 2 API is usable in practice in Android.
+- Shadows are not supported with OpenGL ES2 (including Angle builds in Windows).
diff --git a/dist/changes-0.1.0 b/dist/changes-0.1.0
new file mode 100644
index 00000000..854f74e4
--- /dev/null
+++ b/dist/changes-0.1.0
@@ -0,0 +1 @@
+Initial version, no changes. \ No newline at end of file
diff --git a/dist/changes-1.0.0 b/dist/changes-1.0.0
deleted file mode 100644
index e69de29b..00000000
--- a/dist/changes-1.0.0
+++ /dev/null
diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro
index 87857062..bfb07440 100644
--- a/src/datavisualization/datavisualization.pro
+++ b/src/datavisualization/datavisualization.pro
@@ -1,7 +1,10 @@
-TARGET = QtDataVisualization
-QT = core gui
+# Target can't start with 'Qt' as it gets major version number inserted into it in that case,
+# which we don't want.
+TARGET = DataVisualization
+QT = core gui
DEFINES += QT_DATAVISUALIZATION_LIBRARY
+MODULE_INCNAME = QtDataVisualization
QMAKE_DOCS = $$PWD/doc/qtdatavisualization.qdocconf
diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf
index e3189604..82a5d8c4 100644
--- a/src/datavisualization/doc/qtdatavisualization.qdocconf
+++ b/src/datavisualization/doc/qtdatavisualization.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtDataVisualization
description = Qt Data Visualization Reference Documentation
-version = 1.0.0
+version = 0.1.0
exampledirs += ../../../examples \
snippets
@@ -18,14 +18,14 @@ depends += qtcore \
qhp.projects = qtdatavisualization
qhp.qtdatavisualization.file = qtdatavisualization.qhp
-qhp.qtdatavisualization.namespace = org.qt-project.qtdatavisualization.1.0.0
+qhp.qtdatavisualization.namespace = org.qt-project.qtdatavisualization.0.1.0
qhp.qtdatavisualization.virtualFolder = qtdatavisualization
qhp.qtdatavisualization.indexTitle = Qt Data Visualization
qhp.qtdatavisualization.indexRoot =
-qhp.qtdatavisualization.filterAttributes = qtdatavisualization 1.0.0 qtrefdoc
-qhp.qtdatavisualization.customFilters.Qt.name = QtDataVisualization 1.0.0
-qhp.qtdatavisualization.customFilters.Qt.filterAttributes = qtdatavisualization 1.0.0
+qhp.qtdatavisualization.filterAttributes = qtdatavisualization 0.1.0 qtrefdoc
+qhp.qtdatavisualization.customFilters.Qt.name = QtDataVisualization 0.1.0
+qhp.qtdatavisualization.customFilters.Qt.filterAttributes = qtdatavisualization 0.1.0
qhp.qtdatavisualization.subprojects = classes
qhp.qtdatavisualization.subprojects.classes.title = C++ Classes
qhp.qtdatavisualization.subprojects.classes.indexTitle = Qt Data Visualization C++ Classes
diff --git a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp
index 2f3d6a98..d32bde0e 100644
--- a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp
+++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp
@@ -82,11 +82,13 @@ QItemModelSurfaceDataProxy *proxy = new QItemModelSurfaceDataProxy(customModel,
//! [6]
qmake
make
+make install
//! [6]
//! [7]
qmake CONFIG+=static
make
+make install
//! [7]
//! [8]
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
index ac734960..eefa2888 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -21,13 +21,13 @@
#include <qglobal.h>
-#define QT_DATAVISUALIZATION_VERSION_STR "0.0.1"
+#define QT_DATAVISUALIZATION_VERSION_STR "0.1.0"
/*
QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QT_DATAVISUALIZATION_VERSION 0x000001
+#define QT_DATAVISUALIZATION_VERSION 0x000100
/*
- can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 1, 0))
+ can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0))
*/
#define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))