From 1922e7eed38b3fa2288ac64d799ff829cfc41d55 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 22 Dec 2019 16:14:24 +0000
Subject: [PATCH] guard qtestevent, qtestkeyboard, qtestmouse and qtesttouch
 headers with QT_GUI_LIB

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 src/test/qtestevent.h    | 3 ---
 src/test/qtestkeyboard.h | 9 +++++++--
 src/test/qtestmouse.h    | 5 +++++
 src/test/qtesttouch.h    | 5 +++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/test/qtestevent.h b/src/test/qtestevent.h
index 530ba3b36..cd1875838 100644
--- a/src/test/qtestevent.h
+++ b/src/test/qtestevent.h
@@ -37,11 +37,8 @@
 #include <QtTest/qtest_global.h>
 #include <QtTest/qtestsystem.h>
 #include <QtCore/qlist.h>
-
-#ifdef QT_GUI_LIB
 #include <QtTest/qtestkeyboard.h>
 #include <QtTest/qtestmouse.h>
-#endif
 
 #include <stdlib.h>
 
diff --git a/src/test/qtestkeyboard.h b/src/test/qtestkeyboard.h
index c5e9561af..42fe39f93 100644
--- a/src/test/qtestkeyboard.h
+++ b/src/test/qtestkeyboard.h
@@ -31,11 +31,14 @@
 **
 ****************************************************************************/
 
-#if !defined(QTESTKEYBOARD_H)
+#ifndef QTESTKEYBOARD_H
 #define QTESTKEYBOARD_H
 
-#include <QtTest/qtestassert.h>
 #include <QtTest/qtest_global.h>
+
+#ifdef QT_GUI_LIB
+
+#include <QtTest/qtestassert.h>
 #include <QtTest/qtestsystem.h>
 #include <QtTest/qtestspontaneevent.h>
 #include <QtCore/qpointer.h>
@@ -175,4 +178,6 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
+#endif // QT_GUI_LIB
+
 #endif // QTESTKEYBOARD_H
diff --git a/src/test/qtestmouse.h b/src/test/qtestmouse.h
index 8d8e11a86..593821a8c 100644
--- a/src/test/qtestmouse.h
+++ b/src/test/qtestmouse.h
@@ -35,6 +35,9 @@
 #define QTESTMOUSE_H
 
 #include <QtTest/qtest_global.h>
+
+#ifdef QT_GUI_LIB
+
 #include <QtTest/qtestassert.h>
 #include <QtTest/qtestsystem.h>
 #include <QtTest/qtestspontaneevent.h>
@@ -127,4 +130,6 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
+#endif // QT_GUI_LIB
+
 #endif // QTESTMOUSE_H
diff --git a/src/test/qtesttouch.h b/src/test/qtesttouch.h
index 56a09e149..9696f2884 100644
--- a/src/test/qtesttouch.h
+++ b/src/test/qtesttouch.h
@@ -35,6 +35,9 @@
 #define QTESTTOUCH_H
 
 #include <QtTest/qtest_global.h>
+
+#ifdef QT_GUI_LIB
+
 #include <QtTest/qtestassert.h>
 #include <QtTest/qtestsystem.h>
 #include <QtTest/qtestspontaneevent.h>
@@ -134,4 +137,6 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
+#endif // QT_GUI_LIB
+
 #endif // QTESTTOUCH_H
-- 
2.11.0