summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-13 09:59:52 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-13 10:09:17 +0200
commit88cd10aa7b3559b092cf5575b0a17d002dc100ae (patch)
tree9d6e7efdec49419558bb4ef4a9bc02ae3cb1cfc4 /tests
parentecabd51692b476567dc42a745f51996ec665b385 (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>
Diffstat (limited to 'tests')
-rw-r--r--tests/barstest/barstest.pro2
-rw-r--r--tests/directional/directional.pro2
-rw-r--r--tests/multigraphs/multigraphs.pro2
-rw-r--r--tests/qmlcamera/qmlcamera.pro5
-rw-r--r--tests/qmldynamicdata/qmldynamicdata.pro3
-rw-r--r--tests/scattertest/scattertest.pro2
-rw-r--r--tests/spectrum/spectrumapp/spectrumapp.pro8
-rw-r--r--tests/surfacetest/surfacetest.pro2
-rw-r--r--tests/tests.pri3
9 files changed, 2 insertions, 27 deletions
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