Mercurial > trustbridge
changeset 142:52993db093f4
merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Mon, 24 Mar 2014 16:06:50 +0100 |
| parents | f5fa39347366 (diff) 7a8d960d60c9 (current diff) |
| children | dc9970d7b9bf 252ffe6e27fd |
| files | |
| diffstat | 5 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/tests/CMakeLists.txt Mon Mar 24 14:57:37 2014 +0000 +++ b/ui/tests/CMakeLists.txt Mon Mar 24 16:06:50 2014 +0100 @@ -3,6 +3,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../common) find_package(Qt5Test) +include_directories(${Qt5Test_INCLUDE_DIRS}) find_program(HIAWATHA_EXECUTABLE hiawatha) if (NOT HIAWATHA_EXECUTABLE) @@ -28,9 +29,11 @@ add_m13_test(certlistparsertest.cpp "${CERTIFICATELIST_SOURCES}") # Downloader -set(DOWNLOADER_SOURCES_WITH_RESOURCES ${DOWNLOADER_SOURCES}) -qt5_add_resources(DOWNLOADER_SOURCES_WITH_RESOURCES ${M13UI_RESOURCES}) -add_m13_test(downloadertest.cpp "${DOWNLOADER_SOURCES_WITH_RESOURCES}") +if (HIAWATHA_EXECUTABLE) + set(DOWNLOADER_SOURCES_WITH_RESOURCES ${DOWNLOADER_SOURCES}) + qt5_add_resources(DOWNLOADER_SOURCES_WITH_RESOURCES ${M13UI_RESOURCES}) + add_m13_test(downloadertest.cpp "${DOWNLOADER_SOURCES_WITH_RESOURCES}") +endif() # Cinstprocess add_m13_test(cinstprocesstest.cpp "${CERTIFICATELIST_SOURCES}")
--- a/ui/tests/certlistparsertest.h Mon Mar 24 14:57:37 2014 +0000 +++ b/ui/tests/certlistparsertest.h Mon Mar 24 16:06:50 2014 +0100 @@ -2,7 +2,7 @@ #define CERTLISTPARSERTEST_H #include <QObject> -#include <QtTest/QtTest> +#include <QtTest> class CertificateList;
--- a/ui/tests/cinstprocesstest.cpp Mon Mar 24 14:57:37 2014 +0000 +++ b/ui/tests/cinstprocesstest.cpp Mon Mar 24 16:06:50 2014 +0100 @@ -6,7 +6,6 @@ #include <QDir> #include <QFile> #include <QProcess> -#include <QTest> #define RELATIVE_CINST_PATH "../../cinst/cinst"