1 files changed, 8 insertions, 31 deletions
diff --git a/tests/tests.pri b/tests/tests.pri
index ec0cd754..1a723c59 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -1,36 +1,13 @@
-!include( ../config.pri ) {
-    error( "Couldn't find the config.pri file!" )
-}
+INCLUDEPATH += ../../include
 
+LIBS += -L$$OUT_PWD/../../lib
 TEMPLATE = app
 
-DESTDIR = $$CHART_BUILD_BIN_DIR
-OBJECTS_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
-MOC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
-UI_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
-RCC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
-
-# staticlib config causes problems when building executables
-staticlib: CONFIG-=staticlib
+QT += charts
 
-android {
-    # Workaround to fix android deployment, which seems to always look for target in
-    # OUT_PWD instead of DESTDIR.
-    COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
-    contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
-    QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
-
-    contains(TARGET, qml.*) {
-        charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
-        charts_qmldir.path = /assets/imports/QtCommercial/Chart
-        charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
-        charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
-        INSTALLS += charts_qmldir charts_qmlplugin
-    } else:contains(TARGET, quick2.*) {
-        charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
-        charts_qmldir.path = /assets/qml/QtCommercial/Chart
-        charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
-        charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
-        INSTALLS += charts_qmldir charts_qmlplugin
-    }
+contains(TARGET, qml.*) {
+    QT += qml quick
 }
+
+target.path = $$[QT_INSTALL_TESTS]/charts/$$TARGET
+INSTALLS += target