diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-18 14:21:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-18 14:22:06 +0100 |
| commit | af09ee2a3d6d8c57a4db705765a8b6eca4127ce5 (patch) | |
| tree | a8eb7162b6ae04f454cdcf6050b83808c2bc355e | |
| parent | 6663228c1c875da566ddf0cfd148700e271db1f8 (diff) | |
| parent | 37e40d3ae296ed8a4ad4f2a641c984897316671f (diff) | |
| download | qtenginio-af09ee2a3d6d8c57a4db705765a8b6eca4127ce5.tar.gz | |
Merge remote-tracking branch 'origin/1.1.1' into 1.1
Change-Id: I1d4f5d29e5d72df2479de2a33b2d7cb010946fea
| -rw-r--r-- | tests/auto/common/testfiles.qrc | 5 | ||||
| -rw-r--r-- | tests/auto/enginioclient/enginioclient.pro | 2 | ||||
| -rw-r--r-- | tests/auto/enginiomodel/enginiomodel.pro | 2 | ||||
| -rw-r--r-- | tests/auto/files/files.pro | 5 | ||||
| -rw-r--r-- | tests/auto/files/tst_files.cpp | 2 |
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 236f489..3e5daf6 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; |