# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1395673610 -3600
# Node ID 52993db093f48860e15a8970665f93f2c3bb4fa8
# Parent  f5fa39347366e08361e66f4d48205b17ec3f1b55# Parent  7a8d960d60c986f4394be90ce092d83b5e8b04d6
merged.

diff -r 7a8d960d60c9 -r 52993db093f4 ui/tests/CMakeLists.txt
--- 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}")
diff -r 7a8d960d60c9 -r 52993db093f4 ui/tests/certlistparsertest.h
--- 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;
 
diff -r 7a8d960d60c9 -r 52993db093f4 ui/tests/cinstprocesstest.cpp
--- 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"
 
diff -r 7a8d960d60c9 -r 52993db093f4 ui/tests/cinstprocesstest.h
--- a/ui/tests/cinstprocesstest.h	Mon Mar 24 14:57:37 2014 +0000
+++ b/ui/tests/cinstprocesstest.h	Mon Mar 24 16:06:50 2014 +0100
@@ -7,6 +7,7 @@
 
 #include <QObject>
 #include <QProcess>
+#include <QTest>
 #include "certificatelist.h"
 
 class CinstProcessTest: public QObject
diff -r 7a8d960d60c9 -r 52993db093f4 ui/tests/downloadertest.h
--- a/ui/tests/downloadertest.h	Mon Mar 24 14:57:37 2014 +0000
+++ b/ui/tests/downloadertest.h	Mon Mar 24 16:06:50 2014 +0100
@@ -2,7 +2,7 @@
 #define DOWNLOADERTEST_H
 
 #include <QObject>
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QProcess>
 #include <QTemporaryDir>
 #include <QSignalSpy>