diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-13 09:59:52 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-13 10:09:17 +0200 |
commit | 88cd10aa7b3559b092cf5575b0a17d002dc100ae (patch) | |
tree | 9d6e7efdec49419558bb4ef4a9bc02ae3cb1cfc4 | |
parent | ecabd51692b476567dc42a745f51996ec665b385 (diff) |
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>
-rw-r--r-- | .qmake.conf | 4 | ||||
-rw-r--r-- | examples/datavisualization/audiolevels/audiolevels.cpp (renamed from examples/audiolevels/audiolevels.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/audiolevels/audiolevels.h (renamed from examples/audiolevels/audiolevels.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/audiolevels/audiolevels.pro (renamed from examples/audiolevels/audiolevels.pro) | 6 | ||||
-rw-r--r-- | examples/datavisualization/audiolevels/audiolevelsiodevice.cpp (renamed from examples/audiolevels/audiolevelsiodevice.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/audiolevels/audiolevelsiodevice.h (renamed from examples/audiolevels/audiolevelsiodevice.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/audiolevels/doc/images/audiolevels-example.png (renamed from examples/audiolevels/doc/images/audiolevels-example.png) | bin | 120978 -> 120978 bytes | |||
-rw-r--r-- | examples/datavisualization/audiolevels/doc/src/audiolevels.qdoc (renamed from examples/audiolevels/doc/src/audiolevels.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/audiolevels/main.cpp (renamed from examples/audiolevels/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/bars/bars.pro (renamed from examples/bars/bars.pro) | 5 | ||||
-rw-r--r-- | examples/datavisualization/bars/doc/images/bars-example.png (renamed from examples/bars/doc/images/bars-example.png) | bin | 151337 -> 151337 bytes | |||
-rw-r--r-- | examples/datavisualization/bars/doc/src/bars.qdoc (renamed from examples/bars/doc/src/bars.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/bars/graphmodifier.cpp (renamed from examples/bars/graphmodifier.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/bars/graphmodifier.h (renamed from examples/bars/graphmodifier.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/bars/main.cpp (renamed from examples/bars/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/custominput.pro (renamed from examples/custominput/custominput.pro) | 5 | ||||
-rw-r--r-- | examples/datavisualization/custominput/custominput.qrc (renamed from examples/custominput/custominput.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/custominputhandler.cpp (renamed from examples/custominput/custominputhandler.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/custominputhandler.h (renamed from examples/custominput/custominputhandler.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/data/data.txt (renamed from examples/custominput/data/data.txt) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/doc/images/custominput-example.png (renamed from examples/custominput/doc/images/custominput-example.png) | bin | 62422 -> 62422 bytes | |||
-rw-r--r-- | examples/datavisualization/custominput/doc/src/custominput.qdoc (renamed from examples/custominput/doc/src/custominput.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/main.cpp (renamed from examples/custominput/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/scatterdatamodifier.cpp (renamed from examples/custominput/scatterdatamodifier.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/custominput/scatterdatamodifier.h (renamed from examples/custominput/scatterdatamodifier.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/customproxy.pro (renamed from examples/customproxy/customproxy.pro) | 6 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/customproxy.qrc (renamed from examples/customproxy/customproxy.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/data/raindata.txt (renamed from examples/customproxy/data/raindata.txt) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/doc/images/customproxy-example.png (renamed from examples/customproxy/doc/images/customproxy-example.png) | bin | 125698 -> 125698 bytes | |||
-rw-r--r-- | examples/datavisualization/customproxy/doc/src/customproxy.qdoc (renamed from examples/customproxy/doc/src/customproxy.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/main.cpp (renamed from examples/customproxy/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/rainfallgraph.cpp (renamed from examples/customproxy/rainfallgraph.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/rainfallgraph.h (renamed from examples/customproxy/rainfallgraph.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/variantbardatamapping.cpp (renamed from examples/customproxy/variantbardatamapping.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/variantbardatamapping.h (renamed from examples/customproxy/variantbardatamapping.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/variantbardataproxy.cpp (renamed from examples/customproxy/variantbardataproxy.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/variantbardataproxy.h (renamed from examples/customproxy/variantbardataproxy.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/variantdataset.cpp (renamed from examples/customproxy/variantdataset.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/customproxy/variantdataset.h (renamed from examples/customproxy/variantdataset.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/datavisualization.pro | 21 | ||||
-rw-r--r-- | examples/datavisualization/examples.pri | 13 | ||||
-rw-r--r-- | examples/datavisualization/itemmodel/doc/images/itemmodel-example-2.png (renamed from examples/itemmodel/doc/images/itemmodel-example-2.png) | bin | 78536 -> 78536 bytes | |||
-rw-r--r-- | examples/datavisualization/itemmodel/doc/images/itemmodel-example.png (renamed from examples/itemmodel/doc/images/itemmodel-example.png) | bin | 45381 -> 45381 bytes | |||
-rw-r--r-- | examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc (renamed from examples/itemmodel/doc/src/itemmodel.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/itemmodel/itemmodel.pro (renamed from examples/itemmodel/itemmodel.pro) | 5 | ||||
-rw-r--r-- | examples/datavisualization/itemmodel/main.cpp (renamed from examples/itemmodel/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/doc/images/qmlbars-example.png (renamed from examples/qmlbars/doc/images/qmlbars-example.png) | bin | 149167 -> 149167 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlbars/doc/src/qmlbars.qdoc (renamed from examples/qmlbars/doc/src/qmlbars.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/main.cpp (renamed from examples/qmlbars/main.cpp) | 9 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml (renamed from examples/qmlbars/qml/qmlbars/Axes.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qml/qmlbars/Data.qml (renamed from examples/qmlbars/qml/qmlbars/Data.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qml/qmlbars/main.qml (renamed from examples/qmlbars/qml/qmlbars/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qmlbars.desktop (renamed from examples/qmlbars/qmlbars.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qmlbars.pro (renamed from examples/qmlbars/qmlbars.pro) | 3 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qmlbars.qrc (renamed from examples/qmlbars/qmlbars.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qmlbars64.png (renamed from examples/qmlbars/qmlbars64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/doc/images/qmlcustominput-example.png (renamed from examples/qmlcustominput/doc/images/qmlcustominput-example.png) | bin | 57821 -> 57821 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc (renamed from examples/qmlcustominput/doc/src/qmlcustominput.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/main.cpp (renamed from examples/qmlcustominput/main.cpp) | 9 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qml/qmlcustominput/Data.qml (renamed from examples/qmlcustominput/qml/qmlcustominput/Data.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qml/qmlcustominput/NewButton.qml (renamed from examples/qmlcustominput/qml/qmlcustominput/NewButton.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml (renamed from examples/qmlcustominput/qml/qmlcustominput/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qmlcustominput.desktop (renamed from examples/qmlcustominput/qmlcustominput.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qmlcustominput.pro (renamed from examples/qmlcustominput/qmlcustominput.pro) | 3 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qmlcustominput.qrc (renamed from examples/qmlcustominput/qmlcustominput.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qmlcustominput64.png (renamed from examples/qmlcustominput/qmlcustominput64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qmlcustominput80.png (renamed from examples/qmlcustominput/qmlcustominput80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/doc/images/qmllegend-example.png (renamed from examples/qmllegend/doc/images/qmllegend-example.png) | bin | 98023 -> 98023 bytes | |||
-rw-r--r-- | examples/datavisualization/qmllegend/doc/src/qmllegend.qdoc (renamed from examples/qmllegend/doc/src/qmllegend.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/main.cpp (renamed from examples/qmllegend/main.cpp) | 9 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qml/qmllegend/Data.qml (renamed from examples/qmllegend/qml/qmllegend/Data.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml (renamed from examples/qmllegend/qml/qmllegend/LegendItem.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qml/qmllegend/NewButton.qml (renamed from examples/qmllegend/qml/qmllegend/NewButton.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qml/qmllegend/main.qml (renamed from examples/qmllegend/qml/qmllegend/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qmllegend.desktop (renamed from examples/qmllegend/qmllegend.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qmllegend.pro (renamed from examples/qmllegend/qmllegend.pro) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qmllegend.qrc (renamed from examples/qmllegend/qmllegend.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qmllegend64.png (renamed from examples/qmllegend/qmllegend64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/doc/images/qmlmultigraph-example.png (renamed from examples/qmlmultigraph/doc/images/qmlmultigraph-example.png) | bin | 82347 -> 82347 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/doc/src/qmlmultigraph.qdoc (renamed from examples/qmlmultigraph/doc/src/qmlmultigraph.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/main.cpp (renamed from examples/qmlmultigraph/main.cpp) | 9 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml (renamed from examples/qmlmultigraph/qml/qmlmultigraph/Data.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/NewButton.qml (renamed from examples/qmlmultigraph/qml/qmlmultigraph/NewButton.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml (renamed from examples/qmlmultigraph/qml/qmlmultigraph/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qmlmultigraph.desktop (renamed from examples/qmlmultigraph/qmlmultigraph.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qmlmultigraph.pro (renamed from examples/qmlmultigraph/qmlmultigraph.pro) | 3 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qmlmultigraph.qrc (renamed from examples/qmlmultigraph/qmlmultigraph.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qmlmultigraph64.png (renamed from examples/qmlmultigraph/qmlmultigraph64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/datasource.cpp (renamed from examples/qmloscilloscope/datasource.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/datasource.h (renamed from examples/qmloscilloscope/datasource.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/doc/images/qmloscilloscope-example.png (renamed from examples/qmloscilloscope/doc/images/qmloscilloscope-example.png) | bin | 235720 -> 235720 bytes | |||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc (renamed from examples/qmloscilloscope/doc/src/qmloscilloscope.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/main.cpp (renamed from examples/qmloscilloscope/main.cpp) | 9 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/NewButton.qml (renamed from examples/qmloscilloscope/qml/qmloscilloscope/NewButton.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml (renamed from examples/qmloscilloscope/qml/qmloscilloscope/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qmloscilloscope.desktop (renamed from examples/qmloscilloscope/qmloscilloscope.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qmloscilloscope.pro (renamed from examples/qmloscilloscope/qmloscilloscope.pro) | 3 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qmloscilloscope.qrc (renamed from examples/qmloscilloscope/qmloscilloscope.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qmloscilloscope64.png (renamed from examples/qmloscilloscope/qmloscilloscope64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/doc/images/qmlscatter-example.png (renamed from examples/qmlscatter/doc/images/qmlscatter-example.png) | bin | 98086 -> 98086 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlscatter/doc/images/qmlscatter-newproject.png (renamed from examples/qmlscatter/doc/images/qmlscatter-newproject.png) | bin | 37045 -> 37045 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc (renamed from examples/qmlscatter/doc/src/qmlscatter.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/main.cpp (renamed from examples/qmlscatter/main.cpp) | 9 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qml/qmlscatter/Data.qml (renamed from examples/qmlscatter/qml/qmlscatter/Data.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qml/qmlscatter/NewButton.qml (renamed from examples/qmlscatter/qml/qmlscatter/NewButton.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml (renamed from examples/qmlscatter/qml/qmlscatter/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qmlscatter.desktop (renamed from examples/qmlscatter/qmlscatter.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qmlscatter.pro (renamed from examples/qmlscatter/qmlscatter.pro) | 3 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qmlscatter.qrc (renamed from examples/qmlscatter/qmlscatter.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qmlscatter64.png (renamed from examples/qmlscatter/qmlscatter64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/doc/images/qmlsurface-example.png (renamed from examples/qmlsurface/doc/images/qmlsurface-example.png) | bin | 195500 -> 195500 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc (renamed from examples/qmlsurface/doc/src/qmlsurface.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/heightmap.png (renamed from examples/qmlsurface/heightmap.png) | bin | 38634 -> 38634 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurface/main.cpp (renamed from examples/qmlsurface/main.cpp) | 8 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml (renamed from examples/qmlsurface/qml/qmlsurface/Data.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qml/qmlsurface/NewButton.qml (renamed from examples/qmlsurface/qml/qmlsurface/NewButton.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml (renamed from examples/qmlsurface/qml/qmlsurface/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qmlsurface.desktop (renamed from examples/qmlsurface/qmlsurface.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qmlsurface.pro (renamed from examples/qmlsurface/qmlsurface.pro) | 3 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qmlsurface.qrc (renamed from examples/qmlsurface/qmlsurface.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qmlsurface64.png (renamed from examples/qmlsurface/qmlsurface64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/doc/images/qmlsurfacelayers-example.png (renamed from examples/qmlsurfacelayers/doc/images/qmlsurfacelayers-example.png) | bin | 86259 -> 86259 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc (renamed from examples/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/layer_1.png (renamed from examples/qmlsurfacelayers/layer_1.png) | bin | 34540 -> 34540 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/layer_2.png (renamed from examples/qmlsurfacelayers/layer_2.png) | bin | 13022 -> 13022 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/layer_3.png (renamed from examples/qmlsurfacelayers/layer_3.png) | bin | 10553 -> 10553 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/main.cpp (renamed from examples/qmlsurfacelayers/main.cpp) | 8 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/NewButton.qml (renamed from examples/qmlsurfacelayers/qml/qmlsurfacelayers/NewButton.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml (renamed from examples/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.desktop (renamed from examples/qmlsurfacelayers/qmlsurfacelayers.desktop) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.pro (renamed from examples/qmlsurfacelayers/qmlsurfacelayers.pro) | 3 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.qrc (renamed from examples/qmlsurfacelayers/qmlsurfacelayers.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers64.png (renamed from examples/qmlsurfacelayers/qmlsurfacelayers64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/datavisualization/rotations/doc/images/rotations-example.png (renamed from examples/rotations/doc/images/rotations-example.png) | bin | 69487 -> 69487 bytes | |||
-rw-r--r-- | examples/datavisualization/rotations/doc/src/rotations.qdoc (renamed from examples/rotations/doc/src/rotations.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/rotations/main.cpp (renamed from examples/rotations/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/rotations/mesh/largesphere.obj (renamed from examples/rotations/mesh/largesphere.obj) | 0 | ||||
-rw-r--r-- | examples/datavisualization/rotations/mesh/narrowarrow.obj (renamed from examples/rotations/mesh/narrowarrow.obj) | 0 | ||||
-rw-r--r-- | examples/datavisualization/rotations/rotations.pro (renamed from examples/rotations/rotations.pro) | 5 | ||||
-rw-r--r-- | examples/datavisualization/rotations/rotations.qrc (renamed from examples/rotations/rotations.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/rotations/scatterdatamodifier.cpp (renamed from examples/rotations/scatterdatamodifier.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/rotations/scatterdatamodifier.h (renamed from examples/rotations/scatterdatamodifier.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/scatter/doc/images/scatter-example.png (renamed from examples/scatter/doc/images/scatter-example.png) | bin | 142496 -> 142496 bytes | |||
-rw-r--r-- | examples/datavisualization/scatter/doc/src/scatter.qdoc (renamed from examples/scatter/doc/src/scatter.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/scatter/main.cpp (renamed from examples/scatter/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/scatter/scatter.pro (renamed from examples/scatter/scatter.pro) | 5 | ||||
-rw-r--r-- | examples/datavisualization/scatter/scatterdatamodifier.cpp (renamed from examples/scatter/scatterdatamodifier.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/scatter/scatterdatamodifier.h (renamed from examples/scatter/scatterdatamodifier.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/surface/doc/images/surface-example.png (renamed from examples/surface/doc/images/surface-example.png) | bin | 149046 -> 149046 bytes | |||
-rw-r--r-- | examples/datavisualization/surface/doc/src/surface.qdoc (renamed from examples/surface/doc/src/surface.qdoc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/surface/main.cpp (renamed from examples/surface/main.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/surface/mountain.png (renamed from examples/surface/mountain.png) | bin | 34540 -> 34540 bytes | |||
-rw-r--r-- | examples/datavisualization/surface/surface.pro (renamed from examples/surface/surface.pro) | 5 | ||||
-rw-r--r-- | examples/datavisualization/surface/surface.qrc (renamed from examples/surface/surface.qrc) | 0 | ||||
-rw-r--r-- | examples/datavisualization/surface/surfacegraph.cpp (renamed from examples/surface/surfacegraph.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/surface/surfacegraph.h (renamed from examples/surface/surfacegraph.h) | 0 | ||||
-rw-r--r-- | examples/examples.pri | 9 | ||||
-rw-r--r-- | examples/examples.pro | 21 | ||||
-rw-r--r-- | tests/barstest/barstest.pro | 2 | ||||
-rw-r--r-- | tests/directional/directional.pro | 2 | ||||
-rw-r--r-- | tests/multigraphs/multigraphs.pro | 2 | ||||
-rw-r--r-- | tests/qmlcamera/qmlcamera.pro | 5 | ||||
-rw-r--r-- | tests/qmldynamicdata/qmldynamicdata.pro | 3 | ||||
-rw-r--r-- | tests/scattertest/scattertest.pro | 2 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/spectrumapp.pro | 8 | ||||
-rw-r--r-- | tests/surfacetest/surfacetest.pro | 2 | ||||
-rw-r--r-- | tests/tests.pri | 3 |
191 files changed, 79 insertions, 151 deletions
diff --git a/.qmake.conf b/.qmake.conf index d8bef836..c44318c8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,2 +1,4 @@ -MODULE_VERSION=1.0.0 load(qt_build_config) +CONFIG += qt_example_installs + +MODULE_VERSION=1.0.0 diff --git a/examples/audiolevels/audiolevels.cpp b/examples/datavisualization/audiolevels/audiolevels.cpp index 18c1342a..18c1342a 100644 --- a/examples/audiolevels/audiolevels.cpp +++ b/examples/datavisualization/audiolevels/audiolevels.cpp diff --git a/examples/audiolevels/audiolevels.h b/examples/datavisualization/audiolevels/audiolevels.h index 84d9b4c4..84d9b4c4 100644 --- a/examples/audiolevels/audiolevels.h +++ b/examples/datavisualization/audiolevels/audiolevels.h diff --git a/examples/audiolevels/audiolevels.pro b/examples/datavisualization/audiolevels/audiolevels.pro index 7df4379b..46f01635 100644 --- a/examples/audiolevels/audiolevels.pro +++ b/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/* - diff --git a/examples/audiolevels/audiolevelsiodevice.cpp b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp index c0cd70e3..c0cd70e3 100644 --- a/examples/audiolevels/audiolevelsiodevice.cpp +++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp diff --git a/examples/audiolevels/audiolevelsiodevice.h b/examples/datavisualization/audiolevels/audiolevelsiodevice.h index 45f17626..45f17626 100644 --- a/examples/audiolevels/audiolevelsiodevice.h +++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.h diff --git a/examples/audiolevels/doc/images/audiolevels-example.png b/examples/datavisualization/audiolevels/doc/images/audiolevels-example.png Binary files differindex ec79eb5a..ec79eb5a 100644 --- a/examples/audiolevels/doc/images/audiolevels-example.png +++ b/examples/datavisualization/audiolevels/doc/images/audiolevels-example.png diff --git a/examples/audiolevels/doc/src/audiolevels.qdoc b/examples/datavisualization/audiolevels/doc/src/audiolevels.qdoc index ad87ecc0..ad87ecc0 100644 --- a/examples/audiolevels/doc/src/audiolevels.qdoc +++ b/examples/datavisualization/audiolevels/doc/src/audiolevels.qdoc diff --git a/examples/audiolevels/main.cpp b/examples/datavisualization/audiolevels/main.cpp index 9dd07b1b..9dd07b1b 100644 --- a/examples/audiolevels/main.cpp +++ b/examples/datavisualization/audiolevels/main.cpp diff --git a/examples/bars/bars.pro b/examples/datavisualization/bars/bars.pro index e4e2c5fa..5de4626a 100644 --- a/examples/bars/bars.pro +++ b/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/* diff --git a/examples/bars/doc/images/bars-example.png b/examples/datavisualization/bars/doc/images/bars-example.png Binary files differindex 5bd2c7d9..5bd2c7d9 100644 --- a/examples/bars/doc/images/bars-example.png +++ b/examples/datavisualization/bars/doc/images/bars-example.png diff --git a/examples/bars/doc/src/bars.qdoc b/examples/datavisualization/bars/doc/src/bars.qdoc index 3cfc72b1..3cfc72b1 100644 --- a/examples/bars/doc/src/bars.qdoc +++ b/examples/datavisualization/bars/doc/src/bars.qdoc diff --git a/examples/bars/graphmodifier.cpp b/examples/datavisualization/bars/graphmodifier.cpp index 55f52580..55f52580 100644 --- a/examples/bars/graphmodifier.cpp +++ b/examples/datavisualization/bars/graphmodifier.cpp diff --git a/examples/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h index 674c3262..674c3262 100644 --- a/examples/bars/graphmodifier.h +++ b/examples/datavisualization/bars/graphmodifier.h diff --git a/examples/bars/main.cpp b/examples/datavisualization/bars/main.cpp index f04e501d..f04e501d 100644 --- a/examples/bars/main.cpp +++ b/examples/datavisualization/bars/main.cpp diff --git a/examples/custominput/custominput.pro b/examples/datavisualization/custominput/custominput.pro index 9a94cfcd..303cfc83 100644 --- a/examples/custominput/custominput.pro +++ b/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/* diff --git a/examples/custominput/custominput.qrc b/examples/datavisualization/custominput/custominput.qrc index 8ced2b91..8ced2b91 100644 --- a/examples/custominput/custominput.qrc +++ b/examples/datavisualization/custominput/custominput.qrc diff --git a/examples/custominput/custominputhandler.cpp b/examples/datavisualization/custominput/custominputhandler.cpp index a5734e16..a5734e16 100644 --- a/examples/custominput/custominputhandler.cpp +++ b/examples/datavisualization/custominput/custominputhandler.cpp diff --git a/examples/custominput/custominputhandler.h b/examples/datavisualization/custominput/custominputhandler.h index 60c88ef7..60c88ef7 100644 --- a/examples/custominput/custominputhandler.h +++ b/examples/datavisualization/custominput/custominputhandler.h diff --git a/examples/custominput/data/data.txt b/examples/datavisualization/custominput/data/data.txt index d0689b1f..d0689b1f 100644 --- a/examples/custominput/data/data.txt +++ b/examples/datavisualization/custominput/data/data.txt diff --git a/examples/custominput/doc/images/custominput-example.png b/examples/datavisualization/custominput/doc/images/custominput-example.png Binary files differindex b2656b69..b2656b69 100644 --- a/examples/custominput/doc/images/custominput-example.png +++ b/examples/datavisualization/custominput/doc/images/custominput-example.png diff --git a/examples/custominput/doc/src/custominput.qdoc b/examples/datavisualization/custominput/doc/src/custominput.qdoc index 88c53b4d..88c53b4d 100644 --- a/examples/custominput/doc/src/custominput.qdoc +++ b/examples/datavisualization/custominput/doc/src/custominput.qdoc diff --git a/examples/custominput/main.cpp b/examples/datavisualization/custominput/main.cpp index 069a5b0a..069a5b0a 100644 --- a/examples/custominput/main.cpp +++ b/examples/datavisualization/custominput/main.cpp diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/datavisualization/custominput/scatterdatamodifier.cpp index a2a5bea9..a2a5bea9 100644 --- a/examples/custominput/scatterdatamodifier.cpp +++ b/examples/datavisualization/custominput/scatterdatamodifier.cpp diff --git a/examples/custominput/scatterdatamodifier.h b/examples/datavisualization/custominput/scatterdatamodifier.h index 9ea6a5c8..9ea6a5c8 100644 --- a/examples/custominput/scatterdatamodifier.h +++ b/examples/datavisualization/custominput/scatterdatamodifier.h diff --git a/examples/customproxy/customproxy.pro b/examples/datavisualization/customproxy/customproxy.pro index 2b764a41..7a347d78 100644 --- a/examples/customproxy/customproxy.pro +++ b/examples/datavisualization/customproxy/customproxy.pro @@ -14,11 +14,7 @@ HEADERS += \ variantbardataproxy.h \ variantbardatamapping.h -INSTALLS += target - RESOURCES += customproxy.qrc -OTHER_FILES += data/raindata.txt \ - doc/src/* \ - doc/images/* +OTHER_FILES += data/raindata.txt diff --git a/examples/customproxy/customproxy.qrc b/examples/datavisualization/customproxy/customproxy.qrc index 53cd4915..53cd4915 100644 --- a/examples/customproxy/customproxy.qrc +++ b/examples/datavisualization/customproxy/customproxy.qrc diff --git a/examples/customproxy/data/raindata.txt b/examples/datavisualization/customproxy/data/raindata.txt index 531d66be..531d66be 100644 --- a/examples/customproxy/data/raindata.txt +++ b/examples/datavisualization/customproxy/data/raindata.txt diff --git a/examples/customproxy/doc/images/customproxy-example.png b/examples/datavisualization/customproxy/doc/images/customproxy-example.png Binary files differindex 753b8951..753b8951 100644 --- a/examples/customproxy/doc/images/customproxy-example.png +++ b/examples/datavisualization/customproxy/doc/images/customproxy-example.png diff --git a/examples/customproxy/doc/src/customproxy.qdoc b/examples/datavisualization/customproxy/doc/src/customproxy.qdoc index e666c709..e666c709 100644 --- a/examples/customproxy/doc/src/customproxy.qdoc +++ b/examples/datavisualization/customproxy/doc/src/customproxy.qdoc diff --git a/examples/customproxy/main.cpp b/examples/datavisualization/customproxy/main.cpp index dd74721e..dd74721e 100644 --- a/examples/customproxy/main.cpp +++ b/examples/datavisualization/customproxy/main.cpp diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/datavisualization/customproxy/rainfallgraph.cpp index e2f04923..e2f04923 100644 --- a/examples/customproxy/rainfallgraph.cpp +++ b/examples/datavisualization/customproxy/rainfallgraph.cpp diff --git a/examples/customproxy/rainfallgraph.h b/examples/datavisualization/customproxy/rainfallgraph.h index 6116eb9b..6116eb9b 100644 --- a/examples/customproxy/rainfallgraph.h +++ b/examples/datavisualization/customproxy/rainfallgraph.h diff --git a/examples/customproxy/variantbardatamapping.cpp b/examples/datavisualization/customproxy/variantbardatamapping.cpp index c8369b6e..c8369b6e 100644 --- a/examples/customproxy/variantbardatamapping.cpp +++ b/examples/datavisualization/customproxy/variantbardatamapping.cpp diff --git a/examples/customproxy/variantbardatamapping.h b/examples/datavisualization/customproxy/variantbardatamapping.h index 3a145d9a..3a145d9a 100644 --- a/examples/customproxy/variantbardatamapping.h +++ b/examples/datavisualization/customproxy/variantbardatamapping.h diff --git a/examples/customproxy/variantbardataproxy.cpp b/examples/datavisualization/customproxy/variantbardataproxy.cpp index cf1e1f90..cf1e1f90 100644 --- a/examples/customproxy/variantbardataproxy.cpp +++ b/examples/datavisualization/customproxy/variantbardataproxy.cpp diff --git a/examples/customproxy/variantbardataproxy.h b/examples/datavisualization/customproxy/variantbardataproxy.h index b83f8a71..b83f8a71 100644 --- a/examples/customproxy/variantbardataproxy.h +++ b/examples/datavisualization/customproxy/variantbardataproxy.h diff --git a/examples/customproxy/variantdataset.cpp b/examples/datavisualization/customproxy/variantdataset.cpp index 3576aaab..3576aaab 100644 --- a/examples/customproxy/variantdataset.cpp +++ b/examples/datavisualization/customproxy/variantdataset.cpp diff --git a/examples/customproxy/variantdataset.h b/examples/datavisualization/customproxy/variantdataset.h index f5eb5863..f5eb5863 100644 --- a/examples/customproxy/variantdataset.h +++ b/examples/datavisualization/customproxy/variantdataset.h diff --git a/examples/datavisualization/datavisualization.pro b/examples/datavisualization/datavisualization.pro new file mode 100644 index 00000000..4330ef4c --- /dev/null +++ b/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 diff --git a/examples/datavisualization/examples.pri b/examples/datavisualization/examples.pri new file mode 100644 index 00000000..d5f37733 --- /dev/null +++ b/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/* diff --git a/examples/itemmodel/doc/images/itemmodel-example-2.png b/examples/datavisualization/itemmodel/doc/images/itemmodel-example-2.png Binary files differindex 677b7eec..677b7eec 100644 --- a/examples/itemmodel/doc/images/itemmodel-example-2.png +++ b/examples/datavisualization/itemmodel/doc/images/itemmodel-example-2.png diff --git a/examples/itemmodel/doc/images/itemmodel-example.png b/examples/datavisualization/itemmodel/doc/images/itemmodel-example.png Binary files differindex c042f84d..c042f84d 100644 --- a/examples/itemmodel/doc/images/itemmodel-example.png +++ b/examples/datavisualization/itemmodel/doc/images/itemmodel-example.png diff --git a/examples/itemmodel/doc/src/itemmodel.qdoc b/examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc index 16cd1974..16cd1974 100644 --- a/examples/itemmodel/doc/src/itemmodel.qdoc +++ b/examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc diff --git a/examples/itemmodel/itemmodel.pro b/examples/datavisualization/itemmodel/itemmodel.pro index f319f690..844fe3d8 100644 --- a/examples/itemmodel/itemmodel.pro +++ b/examples/datavisualization/itemmodel/itemmodel.pro @@ -4,9 +4,4 @@ SOURCES += main.cpp -INSTALLS += target - QT += widgets - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp index 2fce72aa..2fce72aa 100644 --- a/examples/itemmodel/main.cpp +++ b/examples/datavisualization/itemmodel/main.cpp diff --git a/examples/qmlbars/doc/images/qmlbars-example.png b/examples/datavisualization/qmlbars/doc/images/qmlbars-example.png Binary files differindex 64ad6b0e..64ad6b0e 100644 --- a/examples/qmlbars/doc/images/qmlbars-example.png +++ b/examples/datavisualization/qmlbars/doc/images/qmlbars-example.png diff --git a/examples/qmlbars/doc/src/qmlbars.qdoc b/examples/datavisualization/qmlbars/doc/src/qmlbars.qdoc index cc344c9c..cc344c9c 100644 --- a/examples/qmlbars/doc/src/qmlbars.qdoc +++ b/examples/datavisualization/qmlbars/doc/src/qmlbars.qdoc diff --git a/examples/qmlbars/main.cpp b/examples/datavisualization/qmlbars/main.cpp index d3cfaf0c..a6b2f4c5 100644 --- a/examples/qmlbars/main.cpp +++ b/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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif + viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + viewer.setTitle(QStringLiteral("Monthly income/expenses")); viewer.setSource(QUrl("qrc:/qml/qmlbars/main.qml")); diff --git a/examples/qmlbars/qml/qmlbars/Axes.qml b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml index 29979e1b..29979e1b 100644 --- a/examples/qmlbars/qml/qmlbars/Axes.qml +++ b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml diff --git a/examples/qmlbars/qml/qmlbars/Data.qml b/examples/datavisualization/qmlbars/qml/qmlbars/Data.qml index 7e0978c6..7e0978c6 100644 --- a/examples/qmlbars/qml/qmlbars/Data.qml +++ b/examples/datavisualization/qmlbars/qml/qmlbars/Data.qml diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml index 0ff060ca..0ff060ca 100644 --- a/examples/qmlbars/qml/qmlbars/main.qml +++ b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml diff --git a/examples/qmlbars/qmlbars.desktop b/examples/datavisualization/qmlbars/qmlbars.desktop index cf59c6b8..cf59c6b8 100644 --- a/examples/qmlbars/qmlbars.desktop +++ b/examples/datavisualization/qmlbars/qmlbars.desktop diff --git a/examples/qmlbars/qmlbars.pro b/examples/datavisualization/qmlbars/qmlbars.pro index 7d0460f0..c3d48fd9 100644 --- a/examples/qmlbars/qmlbars.pro +++ b/examples/datavisualization/qmlbars/qmlbars.pro @@ -18,6 +18,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmlbars.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/qmlbars/qmlbars.qrc b/examples/datavisualization/qmlbars/qmlbars.qrc index 2240fbef..2240fbef 100644 --- a/examples/qmlbars/qmlbars.qrc +++ b/examples/datavisualization/qmlbars/qmlbars.qrc diff --git a/examples/qmlbars/qmlbars64.png b/examples/datavisualization/qmlbars/qmlbars64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmlbars/qmlbars64.png +++ b/examples/datavisualization/qmlbars/qmlbars64.png diff --git a/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmlcustominput/doc/images/qmlcustominput-example.png b/examples/datavisualization/qmlcustominput/doc/images/qmlcustominput-example.png Binary files differindex 1de740ea..1de740ea 100644 --- a/examples/qmlcustominput/doc/images/qmlcustominput-example.png +++ b/examples/datavisualization/qmlcustominput/doc/images/qmlcustominput-example.png diff --git a/examples/qmlcustominput/doc/src/qmlcustominput.qdoc b/examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc index 7702dadf..7702dadf 100644 --- a/examples/qmlcustominput/doc/src/qmlcustominput.qdoc +++ b/examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc diff --git a/examples/qmlcustominput/main.cpp b/examples/datavisualization/qmlcustominput/main.cpp index cc602be7..9bb88836 100644 --- a/examples/qmlcustominput/main.cpp +++ b/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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif + viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + viewer.setTitle(QStringLiteral("QML Custom Input")); viewer.setSource(QUrl("qrc:/qml/qmlcustominput/main.qml")); diff --git a/examples/qmlcustominput/qml/qmlcustominput/Data.qml b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/Data.qml index 201247f1..201247f1 100644 --- a/examples/qmlcustominput/qml/qmlcustominput/Data.qml +++ b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/Data.qml diff --git a/examples/qmlcustominput/qml/qmlcustominput/NewButton.qml b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/NewButton.qml index e4fb99d2..e4fb99d2 100644 --- a/examples/qmlcustominput/qml/qmlcustominput/NewButton.qml +++ b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/NewButton.qml diff --git a/examples/qmlcustominput/qml/qmlcustominput/main.qml b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml index cfac0f15..cfac0f15 100644 --- a/examples/qmlcustominput/qml/qmlcustominput/main.qml +++ b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml diff --git a/examples/qmlcustominput/qmlcustominput.desktop b/examples/datavisualization/qmlcustominput/qmlcustominput.desktop index 536f87a9..536f87a9 100644 --- a/examples/qmlcustominput/qmlcustominput.desktop +++ b/examples/datavisualization/qmlcustominput/qmlcustominput.desktop diff --git a/examples/qmlcustominput/qmlcustominput.pro b/examples/datavisualization/qmlcustominput/qmlcustominput.pro index 40cd3f24..07e61d72 100644 --- a/examples/qmlcustominput/qmlcustominput.pro +++ b/examples/datavisualization/qmlcustominput/qmlcustominput.pro @@ -19,6 +19,3 @@ qtcAddDeployment() RESOURCES += \ qmlcustominput.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/qmlcustominput/qmlcustominput.qrc b/examples/datavisualization/qmlcustominput/qmlcustominput.qrc index 5800150a..5800150a 100644 --- a/examples/qmlcustominput/qmlcustominput.qrc +++ b/examples/datavisualization/qmlcustominput/qmlcustominput.qrc diff --git a/examples/qmlcustominput/qmlcustominput64.png b/examples/datavisualization/qmlcustominput/qmlcustominput64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmlcustominput/qmlcustominput64.png +++ b/examples/datavisualization/qmlcustominput/qmlcustominput64.png diff --git a/examples/qmlcustominput/qmlcustominput80.png b/examples/datavisualization/qmlcustominput/qmlcustominput80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/qmlcustominput/qmlcustominput80.png +++ b/examples/datavisualization/qmlcustominput/qmlcustominput80.png diff --git a/examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmlcustominput/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmllegend/doc/images/qmllegend-example.png b/examples/datavisualization/qmllegend/doc/images/qmllegend-example.png Binary files differindex ee546077..ee546077 100644 --- a/examples/qmllegend/doc/images/qmllegend-example.png +++ b/examples/datavisualization/qmllegend/doc/images/qmllegend-example.png diff --git a/examples/qmllegend/doc/src/qmllegend.qdoc b/examples/datavisualization/qmllegend/doc/src/qmllegend.qdoc index 586ba415..586ba415 100644 --- a/examples/qmllegend/doc/src/qmllegend.qdoc +++ b/examples/datavisualization/qmllegend/doc/src/qmllegend.qdoc diff --git a/examples/qmllegend/main.cpp b/examples/datavisualization/qmllegend/main.cpp index 881297f6..5c6b8d24 100644 --- a/examples/qmllegend/main.cpp +++ b/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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif + viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + viewer.setTitle(QStringLiteral("Legend example")); viewer.setSource(QUrl("qrc:/qml/qmllegend/main.qml")); diff --git a/examples/qmllegend/qml/qmllegend/Data.qml b/examples/datavisualization/qmllegend/qml/qmllegend/Data.qml index 4681c61c..4681c61c 100644 --- a/examples/qmllegend/qml/qmllegend/Data.qml +++ b/examples/datavisualization/qmllegend/qml/qmllegend/Data.qml diff --git a/examples/qmllegend/qml/qmllegend/LegendItem.qml b/examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml index 50be7a8d..50be7a8d 100644 --- a/examples/qmllegend/qml/qmllegend/LegendItem.qml +++ b/examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml diff --git a/examples/qmllegend/qml/qmllegend/NewButton.qml b/examples/datavisualization/qmllegend/qml/qmllegend/NewButton.qml index e4fb99d2..e4fb99d2 100644 --- a/examples/qmllegend/qml/qmllegend/NewButton.qml +++ b/examples/datavisualization/qmllegend/qml/qmllegend/NewButton.qml diff --git a/examples/qmllegend/qml/qmllegend/main.qml b/examples/datavisualization/qmllegend/qml/qmllegend/main.qml index 6c488d6a..6c488d6a 100644 --- a/examples/qmllegend/qml/qmllegend/main.qml +++ b/examples/datavisualization/qmllegend/qml/qmllegend/main.qml diff --git a/examples/qmllegend/qmllegend.desktop b/examples/datavisualization/qmllegend/qmllegend.desktop index 6ad68edd..6ad68edd 100644 --- a/examples/qmllegend/qmllegend.desktop +++ b/examples/datavisualization/qmllegend/qmllegend.desktop diff --git a/examples/qmllegend/qmllegend.pro b/examples/datavisualization/qmllegend/qmllegend.pro index 4bf520b2..4bf520b2 100644 --- a/examples/qmllegend/qmllegend.pro +++ b/examples/datavisualization/qmllegend/qmllegend.pro diff --git a/examples/qmllegend/qmllegend.qrc b/examples/datavisualization/qmllegend/qmllegend.qrc index b9777b37..b9777b37 100644 --- a/examples/qmllegend/qmllegend.qrc +++ b/examples/datavisualization/qmllegend/qmllegend.qrc diff --git a/examples/qmllegend/qmllegend64.png b/examples/datavisualization/qmllegend/qmllegend64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmllegend/qmllegend64.png +++ b/examples/datavisualization/qmllegend/qmllegend64.png diff --git a/examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmllegend/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmlmultigraph/doc/images/qmlmultigraph-example.png b/examples/datavisualization/qmlmultigraph/doc/images/qmlmultigraph-example.png Binary files differindex 79073f5f..79073f5f 100644 --- a/examples/qmlmultigraph/doc/images/qmlmultigraph-example.png +++ b/examples/datavisualization/qmlmultigraph/doc/images/qmlmultigraph-example.png diff --git a/examples/qmlmultigraph/doc/src/qmlmultigraph.qdoc b/examples/datavisualization/qmlmultigraph/doc/src/qmlmultigraph.qdoc index 5fa25500..5fa25500 100644 --- a/examples/qmlmultigraph/doc/src/qmlmultigraph.qdoc +++ b/examples/datavisualization/qmlmultigraph/doc/src/qmlmultigraph.qdoc diff --git a/examples/qmlmultigraph/main.cpp b/examples/datavisualization/qmlmultigraph/main.cpp index 95201da5..8450e28a 100644 --- a/examples/qmlmultigraph/main.cpp +++ b/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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #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); diff --git a/examples/qmlmultigraph/qml/qmlmultigraph/Data.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml index 998e4be3..998e4be3 100644 --- a/examples/qmlmultigraph/qml/qmlmultigraph/Data.qml +++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml diff --git a/examples/qmlmultigraph/qml/qmlmultigraph/NewButton.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/NewButton.qml index e4fb99d2..e4fb99d2 100644 --- a/examples/qmlmultigraph/qml/qmlmultigraph/NewButton.qml +++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/NewButton.qml diff --git a/examples/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml index 7691563a..7691563a 100644 --- a/examples/qmlmultigraph/qml/qmlmultigraph/main.qml +++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml diff --git a/examples/qmlmultigraph/qmlmultigraph.desktop b/examples/datavisualization/qmlmultigraph/qmlmultigraph.desktop index 90b16a4e..90b16a4e 100644 --- a/examples/qmlmultigraph/qmlmultigraph.desktop +++ b/examples/datavisualization/qmlmultigraph/qmlmultigraph.desktop diff --git a/examples/qmlmultigraph/qmlmultigraph.pro b/examples/datavisualization/qmlmultigraph/qmlmultigraph.pro index 42955632..2231a2d1 100644 --- a/examples/qmlmultigraph/qmlmultigraph.pro +++ b/examples/datavisualization/qmlmultigraph/qmlmultigraph.pro @@ -18,6 +18,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmlmultigraph.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/qmlmultigraph/qmlmultigraph.qrc b/examples/datavisualization/qmlmultigraph/qmlmultigraph.qrc index c5e63a1c..c5e63a1c 100644 --- a/examples/qmlmultigraph/qmlmultigraph.qrc +++ b/examples/datavisualization/qmlmultigraph/qmlmultigraph.qrc diff --git a/examples/qmlmultigraph/qmlmultigraph64.png b/examples/datavisualization/qmlmultigraph/qmlmultigraph64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmlmultigraph/qmlmultigraph64.png +++ b/examples/datavisualization/qmlmultigraph/qmlmultigraph64.png diff --git a/examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index 83ff0ff9..83ff0ff9 100644 --- a/examples/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp diff --git a/examples/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h index 51d3e8e0..51d3e8e0 100644 --- a/examples/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qmloscilloscope/datasource.h diff --git a/examples/qmloscilloscope/doc/images/qmloscilloscope-example.png b/examples/datavisualization/qmloscilloscope/doc/images/qmloscilloscope-example.png Binary files differindex 697f391e..697f391e 100644 --- a/examples/qmloscilloscope/doc/images/qmloscilloscope-example.png +++ b/examples/datavisualization/qmloscilloscope/doc/images/qmloscilloscope-example.png diff --git a/examples/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc index 9fdcd8d2..9fdcd8d2 100644 --- a/examples/qmloscilloscope/doc/src/qmloscilloscope.qdoc +++ b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc diff --git a/examples/qmloscilloscope/main.cpp b/examples/datavisualization/qmloscilloscope/main.cpp index 175dfa1c..dd7f7a30 100644 --- a/examples/qmloscilloscope/main.cpp +++ b/examples/datavisualization/qmloscilloscope/main.cpp @@ -36,12 +36,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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif + viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + viewer.setTitle(QStringLiteral("Oscilloscope example")); //! [0] diff --git a/examples/qmloscilloscope/qml/qmloscilloscope/NewButton.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/NewButton.qml index e4fb99d2..e4fb99d2 100644 --- a/examples/qmloscilloscope/qml/qmloscilloscope/NewButton.qml +++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/NewButton.qml diff --git a/examples/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml index b9284777..b9284777 100644 --- a/examples/qmloscilloscope/qml/qmloscilloscope/main.qml +++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml diff --git a/examples/qmloscilloscope/qmloscilloscope.desktop b/examples/datavisualization/qmloscilloscope/qmloscilloscope.desktop index bd8e8325..bd8e8325 100644 --- a/examples/qmloscilloscope/qmloscilloscope.desktop +++ b/examples/datavisualization/qmloscilloscope/qmloscilloscope.desktop diff --git a/examples/qmloscilloscope/qmloscilloscope.pro b/examples/datavisualization/qmloscilloscope/qmloscilloscope.pro index 5e1a3ddd..c1e556ae 100644 --- a/examples/qmloscilloscope/qmloscilloscope.pro +++ b/examples/datavisualization/qmloscilloscope/qmloscilloscope.pro @@ -22,6 +22,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmloscilloscope.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/qmloscilloscope/qmloscilloscope.qrc b/examples/datavisualization/qmloscilloscope/qmloscilloscope.qrc index a2358789..a2358789 100644 --- a/examples/qmloscilloscope/qmloscilloscope.qrc +++ b/examples/datavisualization/qmloscilloscope/qmloscilloscope.qrc diff --git a/examples/qmloscilloscope/qmloscilloscope64.png b/examples/datavisualization/qmloscilloscope/qmloscilloscope64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmloscilloscope/qmloscilloscope64.png +++ b/examples/datavisualization/qmloscilloscope/qmloscilloscope64.png diff --git a/examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmloscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmlscatter/doc/images/qmlscatter-example.png b/examples/datavisualization/qmlscatter/doc/images/qmlscatter-example.png Binary files differindex 65ec4816..65ec4816 100644 --- a/examples/qmlscatter/doc/images/qmlscatter-example.png +++ b/examples/datavisualization/qmlscatter/doc/images/qmlscatter-example.png diff --git a/examples/qmlscatter/doc/images/qmlscatter-newproject.png b/examples/datavisualization/qmlscatter/doc/images/qmlscatter-newproject.png Binary files differindex 7c81cae8..7c81cae8 100644 --- a/examples/qmlscatter/doc/images/qmlscatter-newproject.png +++ b/examples/datavisualization/qmlscatter/doc/images/qmlscatter-newproject.png diff --git a/examples/qmlscatter/doc/src/qmlscatter.qdoc b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc index fe86d740..fe86d740 100644 --- a/examples/qmlscatter/doc/src/qmlscatter.qdoc +++ b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc diff --git a/examples/qmlscatter/main.cpp b/examples/datavisualization/qmlscatter/main.cpp index e9153289..2215ca40 100644 --- a/examples/qmlscatter/main.cpp +++ b/examples/datavisualization/qmlscatter/main.cpp @@ -36,12 +36,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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif + viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + viewer.setTitle(QStringLiteral("QML scatter example")); //! [0] viewer.setSource(QUrl("qrc:/qml/qmlscatter/main.qml")); diff --git a/examples/qmlscatter/qml/qmlscatter/Data.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/Data.qml index 23c4e5d5..23c4e5d5 100644 --- a/examples/qmlscatter/qml/qmlscatter/Data.qml +++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/Data.qml diff --git a/examples/qmlscatter/qml/qmlscatter/NewButton.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/NewButton.qml index e4fb99d2..e4fb99d2 100644 --- a/examples/qmlscatter/qml/qmlscatter/NewButton.qml +++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/NewButton.qml diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml index beb4ccaa..beb4ccaa 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml diff --git a/examples/qmlscatter/qmlscatter.desktop b/examples/datavisualization/qmlscatter/qmlscatter.desktop index 0f9e5498..0f9e5498 100644 --- a/examples/qmlscatter/qmlscatter.desktop +++ b/examples/datavisualization/qmlscatter/qmlscatter.desktop diff --git a/examples/qmlscatter/qmlscatter.pro b/examples/datavisualization/qmlscatter/qmlscatter.pro index 9d12334a..166b26a0 100644 --- a/examples/qmlscatter/qmlscatter.pro +++ b/examples/datavisualization/qmlscatter/qmlscatter.pro @@ -18,6 +18,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmlscatter.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/qmlscatter/qmlscatter.qrc b/examples/datavisualization/qmlscatter/qmlscatter.qrc index 225d78b0..225d78b0 100644 --- a/examples/qmlscatter/qmlscatter.qrc +++ b/examples/datavisualization/qmlscatter/qmlscatter.qrc diff --git a/examples/qmlscatter/qmlscatter64.png b/examples/datavisualization/qmlscatter/qmlscatter64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmlscatter/qmlscatter64.png +++ b/examples/datavisualization/qmlscatter/qmlscatter64.png diff --git a/examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmlscatter/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmlsurface/doc/images/qmlsurface-example.png b/examples/datavisualization/qmlsurface/doc/images/qmlsurface-example.png Binary files differindex d8d394fa..d8d394fa 100644 --- a/examples/qmlsurface/doc/images/qmlsurface-example.png +++ b/examples/datavisualization/qmlsurface/doc/images/qmlsurface-example.png diff --git a/examples/qmlsurface/doc/src/qmlsurface.qdoc b/examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc index 00ef03d4..00ef03d4 100644 --- a/examples/qmlsurface/doc/src/qmlsurface.qdoc +++ b/examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc diff --git a/examples/qmlsurface/heightmap.png b/examples/datavisualization/qmlsurface/heightmap.png Binary files differindex 051a0125..051a0125 100644 --- a/examples/qmlsurface/heightmap.png +++ b/examples/datavisualization/qmlsurface/heightmap.png diff --git a/examples/qmlsurface/main.cpp b/examples/datavisualization/qmlsurface/main.cpp index 1ea70735..3c31dee4 100644 --- a/examples/qmlsurface/main.cpp +++ b/examples/datavisualization/qmlsurface/main.cpp @@ -34,12 +34,12 @@ 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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif + viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/qml/qmlsurface/main.qml")); diff --git a/examples/qmlsurface/qml/qmlsurface/Data.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml index 5fd4ece8..5fd4ece8 100644 --- a/examples/qmlsurface/qml/qmlsurface/Data.qml +++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml diff --git a/examples/qmlsurface/qml/qmlsurface/NewButton.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/NewButton.qml index e4fb99d2..e4fb99d2 100644 --- a/examples/qmlsurface/qml/qmlsurface/NewButton.qml +++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/NewButton.qml diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml index 1fcedeea..1fcedeea 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml diff --git a/examples/qmlsurface/qmlsurface.desktop b/examples/datavisualization/qmlsurface/qmlsurface.desktop index 66dd0a72..66dd0a72 100644 --- a/examples/qmlsurface/qmlsurface.desktop +++ b/examples/datavisualization/qmlsurface/qmlsurface.desktop diff --git a/examples/qmlsurface/qmlsurface.pro b/examples/datavisualization/qmlsurface/qmlsurface.pro index 560a1e23..34be257a 100644 --- a/examples/qmlsurface/qmlsurface.pro +++ b/examples/datavisualization/qmlsurface/qmlsurface.pro @@ -18,6 +18,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmlsurface.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/qmlsurface/qmlsurface.qrc b/examples/datavisualization/qmlsurface/qmlsurface.qrc index c27f2d56..c27f2d56 100644 --- a/examples/qmlsurface/qmlsurface.qrc +++ b/examples/datavisualization/qmlsurface/qmlsurface.qrc diff --git a/examples/qmlsurface/qmlsurface64.png b/examples/datavisualization/qmlsurface/qmlsurface64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmlsurface/qmlsurface64.png +++ b/examples/datavisualization/qmlsurface/qmlsurface64.png diff --git a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmlsurfacelayers/doc/images/qmlsurfacelayers-example.png b/examples/datavisualization/qmlsurfacelayers/doc/images/qmlsurfacelayers-example.png Binary files differindex a5b179fb..a5b179fb 100644 --- a/examples/qmlsurfacelayers/doc/images/qmlsurfacelayers-example.png +++ b/examples/datavisualization/qmlsurfacelayers/doc/images/qmlsurfacelayers-example.png diff --git a/examples/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc b/examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc index eab9f17f..eab9f17f 100644 --- a/examples/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc +++ b/examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc diff --git a/examples/qmlsurfacelayers/layer_1.png b/examples/datavisualization/qmlsurfacelayers/layer_1.png Binary files differindex 9138c710..9138c710 100644 --- a/examples/qmlsurfacelayers/layer_1.png +++ b/examples/datavisualization/qmlsurfacelayers/layer_1.png diff --git a/examples/qmlsurfacelayers/layer_2.png b/examples/datavisualization/qmlsurfacelayers/layer_2.png Binary files differindex 796df64d..796df64d 100644 --- a/examples/qmlsurfacelayers/layer_2.png +++ b/examples/datavisualization/qmlsurfacelayers/layer_2.png diff --git a/examples/qmlsurfacelayers/layer_3.png b/examples/datavisualization/qmlsurfacelayers/layer_3.png Binary files differindex 61631ae8..61631ae8 100644 --- a/examples/qmlsurfacelayers/layer_3.png +++ b/examples/datavisualization/qmlsurfacelayers/layer_3.png diff --git a/examples/qmlsurfacelayers/main.cpp b/examples/datavisualization/qmlsurfacelayers/main.cpp index 434008c4..bb0c5649 100644 --- a/examples/qmlsurfacelayers/main.cpp +++ b/examples/datavisualization/qmlsurfacelayers/main.cpp @@ -34,12 +34,12 @@ 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::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif + viewer.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/qmlsurfacelayers/main.qml")); diff --git a/examples/qmlsurfacelayers/qml/qmlsurfacelayers/NewButton.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/NewButton.qml index e4fb99d2..e4fb99d2 100644 --- a/examples/qmlsurfacelayers/qml/qmlsurfacelayers/NewButton.qml +++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/NewButton.qml diff --git a/examples/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml index 22c527a2..22c527a2 100644 --- a/examples/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml +++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml diff --git a/examples/qmlsurfacelayers/qmlsurfacelayers.desktop b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.desktop index bdd5c776..bdd5c776 100644 --- a/examples/qmlsurfacelayers/qmlsurfacelayers.desktop +++ b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.desktop diff --git a/examples/qmlsurfacelayers/qmlsurfacelayers.pro b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.pro index 0ba37d1e..3cc8d65c 100644 --- a/examples/qmlsurfacelayers/qmlsurfacelayers.pro +++ b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.pro @@ -18,6 +18,3 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmlsurfacelayers.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/qmlsurfacelayers/qmlsurfacelayers.qrc b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.qrc index 028a91db..028a91db 100644 --- a/examples/qmlsurfacelayers/qmlsurfacelayers.qrc +++ b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers.qrc diff --git a/examples/qmlsurfacelayers/qmlsurfacelayers64.png b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmlsurfacelayers/qmlsurfacelayers64.png +++ b/examples/datavisualization/qmlsurfacelayers/qmlsurfacelayers64.png diff --git a/examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.pri index e5f7990f..e5f7990f 100644 --- a/examples/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/datavisualization/qmlsurfacelayers/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/rotations/doc/images/rotations-example.png b/examples/datavisualization/rotations/doc/images/rotations-example.png Binary files differindex 74bebbf7..74bebbf7 100644 --- a/examples/rotations/doc/images/rotations-example.png +++ b/examples/datavisualization/rotations/doc/images/rotations-example.png diff --git a/examples/rotations/doc/src/rotations.qdoc b/examples/datavisualization/rotations/doc/src/rotations.qdoc index 2de29195..2de29195 100644 --- a/examples/rotations/doc/src/rotations.qdoc +++ b/examples/datavisualization/rotations/doc/src/rotations.qdoc diff --git a/examples/rotations/main.cpp b/examples/datavisualization/rotations/main.cpp index 3ddb7b55..3ddb7b55 100644 --- a/examples/rotations/main.cpp +++ b/examples/datavisualization/rotations/main.cpp diff --git a/examples/rotations/mesh/largesphere.obj b/examples/datavisualization/rotations/mesh/largesphere.obj index 63101413..63101413 100644 --- a/examples/rotations/mesh/largesphere.obj +++ b/examples/datavisualization/rotations/mesh/largesphere.obj diff --git a/examples/rotations/mesh/narrowarrow.obj b/examples/datavisualization/rotations/mesh/narrowarrow.obj index 481fc1d1..481fc1d1 100644 --- a/examples/rotations/mesh/narrowarrow.obj +++ b/examples/datavisualization/rotations/mesh/narrowarrow.obj diff --git a/examples/rotations/rotations.pro b/examples/datavisualization/rotations/rotations.pro index 4a16dba6..bd3e6de8 100644 --- a/examples/rotations/rotations.pro +++ b/examples/datavisualization/rotations/rotations.pro @@ -8,8 +8,3 @@ HEADERS += scatterdatamodifier.h QT += widgets RESOURCES += rotations.qrc - -INSTALLS += target - -OTHER_FILES += doc/src \ - doc/images diff --git a/examples/rotations/rotations.qrc b/examples/datavisualization/rotations/rotations.qrc index bf66ebeb..bf66ebeb 100644 --- a/examples/rotations/rotations.qrc +++ b/examples/datavisualization/rotations/rotations.qrc diff --git a/examples/rotations/scatterdatamodifier.cpp b/examples/datavisualization/rotations/scatterdatamodifier.cpp index d916ffbd..d916ffbd 100644 --- a/examples/rotations/scatterdatamodifier.cpp +++ b/examples/datavisualization/rotations/scatterdatamodifier.cpp diff --git a/examples/rotations/scatterdatamodifier.h b/examples/datavisualization/rotations/scatterdatamodifier.h index 9df1f26a..9df1f26a 100644 --- a/examples/rotations/scatterdatamodifier.h +++ b/examples/datavisualization/rotations/scatterdatamodifier.h diff --git a/examples/scatter/doc/images/scatter-example.png b/examples/datavisualization/scatter/doc/images/scatter-example.png Binary files differindex 82c13855..82c13855 100644 --- a/examples/scatter/doc/images/scatter-example.png +++ b/examples/datavisualization/scatter/doc/images/scatter-example.png diff --git a/examples/scatter/doc/src/scatter.qdoc b/examples/datavisualization/scatter/doc/src/scatter.qdoc index 91227184..91227184 100644 --- a/examples/scatter/doc/src/scatter.qdoc +++ b/examples/datavisualization/scatter/doc/src/scatter.qdoc diff --git a/examples/scatter/main.cpp b/examples/datavisualization/scatter/main.cpp index d1dad77d..d1dad77d 100644 --- a/examples/scatter/main.cpp +++ b/examples/datavisualization/scatter/main.cpp diff --git a/examples/scatter/scatter.pro b/examples/datavisualization/scatter/scatter.pro index beff2164..55baa808 100644 --- a/examples/scatter/scatter.pro +++ b/examples/datavisualization/scatter/scatter.pro @@ -6,8 +6,3 @@ SOURCES += main.cpp scatterdatamodifier.cpp HEADERS += scatterdatamodifier.h QT += widgets - -INSTALLS += target - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/datavisualization/scatter/scatterdatamodifier.cpp index fcba54be..fcba54be 100644 --- a/examples/scatter/scatterdatamodifier.cpp +++ b/examples/datavisualization/scatter/scatterdatamodifier.cpp diff --git a/examples/scatter/scatterdatamodifier.h b/examples/datavisualization/scatter/scatterdatamodifier.h index 7cfe7ff8..7cfe7ff8 100644 --- a/examples/scatter/scatterdatamodifier.h +++ b/examples/datavisualization/scatter/scatterdatamodifier.h diff --git a/examples/surface/doc/images/surface-example.png b/examples/datavisualization/surface/doc/images/surface-example.png Binary files differindex c323df78..c323df78 100644 --- a/examples/surface/doc/images/surface-example.png +++ b/examples/datavisualization/surface/doc/images/surface-example.png diff --git a/examples/surface/doc/src/surface.qdoc b/examples/datavisualization/surface/doc/src/surface.qdoc index 5397b503..5397b503 100644 --- a/examples/surface/doc/src/surface.qdoc +++ b/examples/datavisualization/surface/doc/src/surface.qdoc diff --git a/examples/surface/main.cpp b/examples/datavisualization/surface/main.cpp index 4e82eca8..4e82eca8 100644 --- a/examples/surface/main.cpp +++ b/examples/datavisualization/surface/main.cpp diff --git a/examples/surface/mountain.png b/examples/datavisualization/surface/mountain.png Binary files differindex 9138c710..9138c710 100644 --- a/examples/surface/mountain.png +++ b/examples/datavisualization/surface/mountain.png diff --git a/examples/surface/surface.pro b/examples/datavisualization/surface/surface.pro index 20c8a1a8..d84e1d8d 100644 --- a/examples/surface/surface.pro +++ b/examples/datavisualization/surface/surface.pro @@ -9,9 +9,4 @@ HEADERS += surfacegraph.h QT += widgets -INSTALLS += target - RESOURCES += surface.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/examples/surface/surface.qrc b/examples/datavisualization/surface/surface.qrc index e4a7c38b..e4a7c38b 100644 --- a/examples/surface/surface.qrc +++ b/examples/datavisualization/surface/surface.qrc diff --git a/examples/surface/surfacegraph.cpp b/examples/datavisualization/surface/surfacegraph.cpp index d7524fbc..d7524fbc 100644 --- a/examples/surface/surfacegraph.cpp +++ b/examples/datavisualization/surface/surfacegraph.cpp diff --git a/examples/surface/surfacegraph.h b/examples/datavisualization/surface/surfacegraph.h index 8047be11..8047be11 100644 --- a/examples/surface/surfacegraph.h +++ b/examples/datavisualization/surface/surfacegraph.h diff --git a/examples/examples.pri b/examples/examples.pri deleted file mode 100644 index afa5f008..00000000 --- a/examples/examples.pri +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDEPATH += ../../include - -LIBS += -L$$OUT_PWD/../../lib - -TEMPLATE = app - -QT += datavisualization - -target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/$$TARGET diff --git a/examples/examples.pro b/examples/examples.pro index 4330ef4c..6d79e543 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,21 +1,2 @@ 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 +SUBDIRS += datavisualization diff --git a/tests/barstest/barstest.pro b/tests/barstest/barstest.pro index 108f8aa7..f213ea9e 100644 --- a/tests/barstest/barstest.pro +++ b/tests/barstest/barstest.pro @@ -6,5 +6,3 @@ SOURCES += main.cpp chart.cpp custominputhandler.cpp HEADERS += chart.h custominputhandler.h QT += widgets - -INSTALLS += target diff --git a/tests/directional/directional.pro b/tests/directional/directional.pro index 7138e1f2..25b2a1f6 100644 --- a/tests/directional/directional.pro +++ b/tests/directional/directional.pro @@ -6,5 +6,3 @@ SOURCES += main.cpp scatterdatamodifier.cpp HEADERS += scatterdatamodifier.h QT += widgets - -INSTALLS += target diff --git a/tests/multigraphs/multigraphs.pro b/tests/multigraphs/multigraphs.pro index 914a816a..f1a7cffe 100644 --- a/tests/multigraphs/multigraphs.pro +++ b/tests/multigraphs/multigraphs.pro @@ -8,7 +8,5 @@ HEADERS += data.h QT += widgets -INSTALLS += target - RESOURCES += \ multigraphs.qrc diff --git a/tests/qmlcamera/qmlcamera.pro b/tests/qmlcamera/qmlcamera.pro index 374dc012..1dcc867a 100644 --- a/tests/qmlcamera/qmlcamera.pro +++ b/tests/qmlcamera/qmlcamera.pro @@ -28,8 +28,3 @@ qtcAddDeployment() RESOURCES += \ qmlcamera.qrc -OTHER_FILES += \ - qml/qmlcamera/Data.qml \ - qml/qmlcamera/Axes.qml \ - qml/qmlcamera/main.qml \ - qml/qmlcamera/ControlSurface.qml diff --git a/tests/qmldynamicdata/qmldynamicdata.pro b/tests/qmldynamicdata/qmldynamicdata.pro index 12bf7c10..620689a2 100644 --- a/tests/qmldynamicdata/qmldynamicdata.pro +++ b/tests/qmldynamicdata/qmldynamicdata.pro @@ -19,6 +19,3 @@ qtcAddDeployment() RESOURCES += \ qmldynamicdata.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/tests/scattertest/scattertest.pro b/tests/scattertest/scattertest.pro index 62fb3d39..4fec5b34 100644 --- a/tests/scattertest/scattertest.pro +++ b/tests/scattertest/scattertest.pro @@ -6,5 +6,3 @@ SOURCES += main.cpp scatterchart.cpp HEADERS += scatterchart.h QT += widgets - -INSTALLS += target diff --git a/tests/spectrum/spectrumapp/spectrumapp.pro b/tests/spectrum/spectrumapp/spectrumapp.pro index f5b52954..ab12e221 100644 --- a/tests/spectrum/spectrumapp/spectrumapp.pro +++ b/tests/spectrum/spectrumapp/spectrumapp.pro @@ -47,14 +47,6 @@ RESOURCES = spectrum.qrc } } - -android { - target.path = /libs/$$ANDROID_TARGET_ARCH -} else { - target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/spectrum -} -INSTALLS += target - # Deployment DESTDIR = ..$${spectrum_build_dir} diff --git a/tests/surfacetest/surfacetest.pro b/tests/surfacetest/surfacetest.pro index 9ab890a7..134e8a6e 100644 --- a/tests/surfacetest/surfacetest.pro +++ b/tests/surfacetest/surfacetest.pro @@ -7,8 +7,6 @@ SOURCES += main.cpp \ QT += widgets -INSTALLS += target - HEADERS += \ graphmodifier.h diff --git a/tests/tests.pri b/tests/tests.pri index afa5f008..9b20e0b6 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -6,4 +6,5 @@ TEMPLATE = app QT += datavisualization -target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/$$TARGET +target.path = $$[QT_INSTALL_TESTS]/datavisualization/$$TARGET +INSTALLS += target |