Fix examples installation

Had to add one folder to the examples structure so
installation works correctly.

Change-Id: Ic92dfe9997413a6243abcf5eeba12744ba9e938c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

.qmake.conf

@@ -1,2 +1,4 @@
-MODULE_VERSION=1.0.0
 load(qt_build_config)
+CONFIG += qt_example_installs
+
+MODULE_VERSION=1.0.0

examples/datavisualization/audiolevels/audiolevels.pro

@@ -12,9 +12,3 @@ SOURCES += main.cpp \
 
 HEADERS += audiolevels.h \
            audiolevelsiodevice.h
-
-INSTALLS += target
-
-OTHER_FILES += doc/src/* \
-               doc/images/*
-

examples/datavisualization/bars/bars.pro

@@ -6,8 +6,3 @@ SOURCES += main.cpp graphmodifier.cpp
 HEADERS += graphmodifier.h
 
 QT += widgets
-
-INSTALLS += target
-
-OTHER_FILES += doc/src/* \
-               doc/images/*

examples/datavisualization/custominput/custominput.pro

@@ -9,9 +9,4 @@ HEADERS += scatterdatamodifier.h \
 
 QT += widgets
 
-INSTALLS += target
-
 RESOURCES += custominput.qrc
-
-OTHER_FILES += doc/src/* \
-               doc/images/*

examples/datavisualization/customproxy/customproxy.pro

@@ -14,11 +14,7 @@ HEADERS += \
     variantbardataproxy.h \
     variantbardatamapping.h
 
-INSTALLS += target
-
 RESOURCES += customproxy.qrc
 
-OTHER_FILES += data/raindata.txt \
+OTHER_FILES += data/raindata.txt
-               doc/src/* \
-               doc/images/*
 

examples/datavisualization/datavisualization.pro

@@ -0,0 +1,21 @@
+TEMPLATE = subdirs
+SUBDIRS += qmlbars \
+           qmlscatter \
+           qmlsurface \
+           qmlcustominput \
+           qmllegend \
+           qmlmultigraph \
+           qmloscilloscope \
+           qmlsurfacelayers
+
+!android:!ios {
+    SUBDIRS += bars \
+               custominput \
+               customproxy \
+               itemmodel \
+               scatter \
+               surface \
+               rotations
+}
+
+qtHaveModule(multimedia):!android:!ios: SUBDIRS += audiolevels

examples/datavisualization/examples.pri

@@ -0,0 +1,13 @@
+INCLUDEPATH += ../../../include
+
+LIBS += -L$$OUT_PWD/../../../lib
+
+TEMPLATE = app
+
+QT += datavisualization
+
+target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/$$TARGET
+INSTALLS += target
+
+OTHER_FILES += doc/src/* \
+               doc/images/*

examples/datavisualization/itemmodel/itemmodel.pro

@@ -4,9 +4,4 @@
 
 SOURCES += main.cpp
 
-INSTALLS += target
-
 QT += widgets
-
-OTHER_FILES += doc/src/* \
-               doc/images/*

examples/datavisualization/qmlbars/main.cpp

@@ -34,12 +34,13 @@ int main(int argc, char *argv[])
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
-    viewer.addImportPath(QString::fromLatin1("%1/../../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #else
-    viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #endif
+    viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
+                                      QString::fromLatin1("qml")));
+
     viewer.setTitle(QStringLiteral("Monthly income/expenses"));
 
     viewer.setSource(QUrl("qrc:/qml/qmlbars/main.qml"));

examples/datavisualization/qmlbars/qmlbars.pro

@@ -18,6 +18,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
 qtcAddDeployment()
 
 RESOURCES += qmlbars.qrc
-
-OTHER_FILES += doc/src/* \
-               doc/images/*

examples/datavisualization/qmlcustominput/main.cpp

@@ -34,12 +34,13 @@ int main(int argc, char *argv[])
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
-    viewer.addImportPath(QString::fromLatin1("%1/../../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #else
-    viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #endif
+    viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
+                                      QString::fromLatin1("qml")));
+
     viewer.setTitle(QStringLiteral("QML Custom Input"));
 
     viewer.setSource(QUrl("qrc:/qml/qmlcustominput/main.qml"));

examples/datavisualization/qmlcustominput/qmlcustominput.pro

@@ -19,6 +19,3 @@ qtcAddDeployment()
 
 RESOURCES += \
     qmlcustominput.qrc
-
-OTHER_FILES += doc/src/* \
-               doc/images/*

examples/datavisualization/qmllegend/main.cpp

@@ -34,12 +34,13 @@ int main(int argc, char *argv[])
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
-    viewer.addImportPath(QString::fromLatin1("%1/../../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #else
-    viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #endif
+    viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
+                                      QString::fromLatin1("qml")));
+
     viewer.setTitle(QStringLiteral("Legend example"));
 
     viewer.setSource(QUrl("qrc:/qml/qmllegend/main.qml"));

examples/datavisualization/qmlmultigraph/main.cpp

@@ -34,12 +34,13 @@ int main(int argc, char *argv[])
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
-    viewer.addImportPath(QString::fromLatin1("%1/../../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #else
-    viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(),
+    QString extraImportPath(QStringLiteral("%1/../../../%2"));
-                                                               QString::fromLatin1("qml")));
 #endif
+    viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
+                                      QString::fromLatin1("qml")));
+
     viewer.setTitle(QStringLiteral("QML multigraph example"));
     viewer.setSource(QUrl("qrc:/qml/qmlmultigraph/main.qml"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);

examples/datavisualization/qmlmultigraph/qmlmultigraph.pro

@@ -18,6 +18,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
 qtcAddDeployment()
 
 RESOURCES += qmlmultigraph.qrc
-
-OTHER_FILES += doc/src/* \
-               doc/images/*