From 727fddbe90954ac125268b1b95f54954ee53402d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Tue, 12 Jul 2016 13:41:57 +0200
Subject: Fix build of Android on API level >=21

System header <sys/timeb.h> does not exists anymore
since API level 21.

Task-number: QTBUG-43284
Change-Id: I4b9ca70198ea47d3a32169ff7c35f4fae50f147a
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/assistant/clucene/qclucene-config_p.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/assistant/clucene/qclucene-config_p.h b/src/assistant/clucene/qclucene-config_p.h
index e53b63725..eb3d25526 100644
--- a/src/assistant/clucene/qclucene-config_p.h
+++ b/src/assistant/clucene/qclucene-config_p.h
@@ -31,6 +31,10 @@
 
 #include <QtCore/qglobal.h>
 
+#ifdef Q_OS_ANDROID
+#  include <android/api-level.h>
+#endif
+
 #ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H
 #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1
 
@@ -305,7 +309,7 @@ configure.
 #endif
 
 /* Define to 1 if you have the <sys/timeb.h> header file. */
-#if !defined(__OpenBSD__)
+#if !defined(__OpenBSD__) && !defined(__ANDROID_API__) || __ANDROID_API__ < 21
 #   ifndef _CL_HAVE_SYS_TIMEB_H
 #   define _CL_HAVE_SYS_TIMEB_H  1
 #   endif
-- 
cgit v1.2.3