Merge remote-tracking branch 'origin/1.1' into '1.2'v1.2.0-beta1v1.2.01.2.0

Conflicts:
	.qmake.conf
	LICENSE.LGPLv21
	LICENSE.LGPLv3
	src/enginio_client/chunkdevice_p.h
	src/enginio_client/enginio.h
	src/enginio_client/enginiobackendconnection.cpp
	src/enginio_client/enginiobackendconnection_p.h
	src/enginio_client/enginiobasemodel.h
	src/enginio_client/enginiobasemodel_p.h
	src/enginio_client/enginioclient.cpp
	src/enginio_client/enginioclient.h
	src/enginio_client/enginioclient_global.h
	src/enginio_client/enginioclient_p.h
	src/enginio_client/enginioclientconnection.h
	src/enginio_client/enginiodummyreply.cpp
	src/enginio_client/enginiodummyreply_p.h
	src/enginio_client/enginiofakereply.cpp
	src/enginio_client/enginiofakereply_p.h
	src/enginio_client/enginioidentity.cpp
	src/enginio_client/enginioidentity.h
	src/enginio_client/enginiomodel.cpp
	src/enginio_client/enginiomodel.h
	src/enginio_client/enginiooauth2authentication.h
	src/enginio_client/enginioobjectadaptor_p.h
	src/enginio_client/enginioreply.cpp
	src/enginio_client/enginioreply.h
	src/enginio_client/enginioreply_p.h
	src/enginio_client/enginioreplystate.h
	src/enginio_client/enginiostring.cpp
	src/enginio_client/enginiostring_p.h
	src/enginio_plugin/enginioplugin.cpp
	src/enginio_plugin/enginioplugin_p.h
	src/enginio_plugin/enginioqmlclient.cpp
	src/enginio_plugin/enginioqmlclient_p.h
	src/enginio_plugin/enginioqmlclient_p_p.h
	src/enginio_plugin/enginioqmlmodel.cpp
	src/enginio_plugin/enginioqmlmodel_p.h
	src/enginio_plugin/enginioqmlobjectadaptor_p.h
	src/enginio_plugin/enginioqmlreply.cpp
	src/enginio_plugin/enginioqmlreply_p.h
	tests/auto/common/common.cpp
	tests/auto/common/common.h
	tests/auto/enginioclient/tst_enginioclient.cpp
	tests/auto/enginiomodel/tst_enginiomodel.cpp
	tests/auto/files/tst_files.cpp
	tests/auto/identity/common/identitycommon.h
	tests/auto/identity/oauth2authentication/tst_oauth2authentication.cpp
	tests/auto/notifications/tst_notifications.cpp
	tests/auto/qmltests/tst_enginioclient.qml
	tests/auto/qmltests/tst_enginioreply.qml
	tests/auto/qmltests/tst_files.qml
	tests/auto/qmltests/tst_identity.qml
	tests/auto/qmltests/tst_model.qml
	tests/auto/qmltests/tst_qmltest.cpp
	tests/auto/qmltests/tst_query.qml

Change-Id: Icb6a167ba58b41e1a8e4d2c8f78213eae9472864

5 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/common/testfiles.qrc b/tests/auto/common/testfiles.qrc
new file mode 100644
index 0000000..6a04189
--- /dev/null
+++ b/tests/auto/common/testfiles.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="enginio.png">enginio.png</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/enginioclient/enginioclient.pro b/tests/auto/enginioclient/enginioclient.pro
index 772662b..7c07d2e 100644
--- a/tests/auto/enginioclient/enginioclient.pro
+++ b/tests/auto/enginioclient/enginioclient.pro
@@ -1,8 +1,6 @@
 QT       += testlib enginio
 QT       -= gui
 
-DEFINES += TEST_FILE_PATH=\\\"$$_PRO_FILE_PWD_/../common/enginio.png\\\"
-
 TARGET = tst_enginioclient
 CONFIG   += console testcase
 CONFIG   -= app_bundle
diff --git a/tests/auto/enginiomodel/enginiomodel.pro b/tests/auto/enginiomodel/enginiomodel.pro
index 64c0742..ea2c8a6 100644
--- a/tests/auto/enginiomodel/enginiomodel.pro
+++ b/tests/auto/enginiomodel/enginiomodel.pro
@@ -1,7 +1,5 @@
 QT       += testlib enginio widgets
 
-DEFINES += TEST_FILE_PATH=\\\"$$_PRO_FILE_PWD_/../common/enginio.png\\\"
-
 TARGET = tst_enginiomodel
 CONFIG   += console testcase
 CONFIG   -= app_bundle
diff --git a/tests/auto/files/files.pro b/tests/auto/files/files.pro
index ae191b7..e739874 100644
--- a/tests/auto/files/files.pro
+++ b/tests/auto/files/files.pro
@@ -1,7 +1,5 @@
 QT       += testlib enginio enginio-private core-private
 
-DEFINES += TEST_FILE_PATH=\\\"$$_PRO_FILE_PWD_/../common/enginio.png\\\"
-
 TARGET = tst_files
 CONFIG   += console testcase
 CONFIG   -= app_bundle
@@ -10,4 +8,5 @@ include(../common/common.pri)
 
 TEMPLATE = app
 
-SOURCES += tst_files.cpp
\ No newline at end of file
+SOURCES += tst_files.cpp
+RESOURCES += ../common/testfiles.qrc
diff --git a/tests/auto/files/tst_files.cpp b/tests/auto/files/tst_files.cpp
index 1360f5d..651de68 100644
--- a/tests/auto/files/tst_files.cpp
+++ b/tests/auto/files/tst_files.cpp
@@ -138,7 +138,7 @@ void tst_Files::fileUploadDownload()
     QVERIFY(!_id.isEmpty());
 
     QString fileName = QStringLiteral("test.png");
-    QString filePath = QStringLiteral(TEST_FILE_PATH);
+    QString filePath = QFINDTESTDATA(QStringLiteral("enginio.png"));
     QFile file(filePath);
     QVERIFY(file.exists());
     QString fileId;