Qt Charts project file structure change

Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:

- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
  Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
  usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
  development purposes and it's no longer needed. Also development
  build related debug prints are removed as __DATE__ can't be used
  for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
  structure. The raw HTML files have been removed. Demos are
  combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
  moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
  change.
- The test cases updated according to the project structure change.
  Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
  so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
  file.

Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222

Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

3 files changed, 42 insertions, 28 deletions

diff --git a/plugins/designer/designer.pro b/plugins/designer/designer.pro
index 14677945..4e9f0f47 100644
--- a/plugins/designer/designer.pro
+++ b/plugins/designer/designer.pro
@@ -1,17 +1,19 @@
-!include( ../plugins.pri ) {
-    error( "Couldn't find the plugins.pri file!" )
-}
+CONFIG += plugin
 
-TARGET=qtcommercialchartdesigner
-DESTDIR = $$CHART_BUILD_DESIGNER_PLUGIN_DIR
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += designer
-} else {
-    CONFIG += designer
-}
-HEADERS = qchartsplugin.h
-SOURCES = qchartsplugin.cpp
-RESOURCES = qchartsplugin.qrc
+TEMPLATE = lib
+
+TARGET = qtchartsdesigner
+
+QT += charts
+QT += designer
+
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
+INCLUDEPATH += ../../../include
+
+HEADERS = $$PWD/qchartsplugin.h
+SOURCES = $$PWD/qchartsplugin.cpp
+RESOURCES = $$PWD/qchartsplugin.qrc
 
 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS += target
diff --git a/plugins/designer/qchartsplugin.cpp b/plugins/designer/qchartsplugin.cpp
index b8f407ae..9cf3156d 100644
--- a/plugins/designer/qchartsplugin.cpp
+++ b/plugins/designer/qchartsplugin.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "qchartsplugin.h"
-#include "qchartview.h"
+#include <QtCharts/QChartView>
 #include <QtPlugin>
 
-QTCOMMERCIALCHART_USE_NAMESPACE
+QT_CHARTS_USE_NAMESPACE
 
 QChartsPlugin::QChartsPlugin(QObject *parent) :
     QObject(parent)
@@ -35,21 +35,22 @@ QChartsPlugin::~QChartsPlugin()
 
 QString QChartsPlugin::name() const
 {
-    return "QChartView";
+    return QStringLiteral("QtCharts::QChartView");
 }
 
 QString QChartsPlugin::includeFile() const
 {
 #ifdef linux
-    QString myNewLine = "\n";
+    QString myNewLine = QStringLiteral("\n");
 #endif
 #ifdef WIN32
-    QString myNewLine = "\n\r";
+    QString myNewLine = QStringLiteral("\n\r");
 #endif
 #ifdef __APPLE__
-    QString myNewLine = "\n";
+    QString myNewLine = QStringLiteral("\n");
 #endif
-    return "<qchartview.h>" + myNewLine + "#include <chartsnamespace.h>";
+    return QStringLiteral("<QtCharts/QChartView>") + myNewLine
+            + QStringLiteral("#include <chartsnamespace.h>");
 }
 
 QString QChartsPlugin::group() const
@@ -59,12 +60,12 @@ QString QChartsPlugin::group() const
 
 QIcon QChartsPlugin::icon() const
 {
-    return QIcon(":/images/qcharts.png");
+    return QIcon(QStringLiteral(":/images/qcharts.png"));
 }
 
 QString QChartsPlugin::toolTip() const
 {
-    return tr("An Qt Charts view widget");
+    return tr("A Qt Charts view widget");
 }
 
 QString QChartsPlugin::whatsThis() const
@@ -82,7 +83,20 @@ QWidget *QChartsPlugin::createWidget(QWidget *parent)
     return new QChartView(new QChart(), parent);
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-    Q_EXPORT_PLUGIN2(qtcommercialchart, QChartsPlugin)
-#endif
+QString QChartsPlugin::domXml() const
+{
+    return QStringLiteral("\
+    <ui language=\"c++\">\
+        <widget class=\"QtCharts::QChartView\" name=\"chartview\">\
+            <property name=\"geometry\">\
+                <rect>\
+                    <x>0</x>\
+                    <y>0</y>\
+                    <width>200</width>\
+                    <height>200</height>\
+                </rect>\
+            </property>\
+        </widget>\
+    </ui>");
+}
 
diff --git a/plugins/designer/qchartsplugin.h b/plugins/designer/qchartsplugin.h
index 06ba7214..90d0abe7 100644
--- a/plugins/designer/qchartsplugin.h
+++ b/plugins/designer/qchartsplugin.h
@@ -25,10 +25,7 @@
 
 class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
-#endif
 
     Q_OBJECT
     Q_INTERFACES(QDesignerCustomWidgetInterface)
@@ -44,6 +41,7 @@ public:
     QString whatsThis() const;
     bool isContainer() const;
     QWidget *createWidget(QWidget *parent);
+    QString domXml() const;
 };
 
 #endif /* QCHARTSPLUGIN_H */