summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2016-07-12 13:41:57 +0200
committerAndré Klitzing <aklitzing@gmail.com>2016-07-20 12:11:02 +0000
commit727fddbe90954ac125268b1b95f54954ee53402d (patch)
treef44242ff32c93a08f0e36d04260d2442b9de07d5
parent398727d703941c9708c54bc1f9c35e8ddff41607 (diff)
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>
-rw-r--r--src/assistant/clucene/qclucene-config_p.h6
1 files changed, 5 insertions, 1 deletions
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