From d154d32becc2ca2bd6382150db57a005a9dc46b5 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: May 29 2014 23:45:56 +0000 Subject: #include --- diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch index f842eaf..f211d12 100644 --- a/qttools-opensource-src-5.3.0-system-clucene.patch +++ b/qttools-opensource-src-5.3.0-system-clucene.patch @@ -131,10 +131,22 @@ diff -ur qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri q #Header files HEADERS += qclucene_global_p.h \ +diff -ur qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h qttools-opensource-src-5.3.0-system-clucene/src/assistant/clucene/qclucene-config_p.h +--- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h 2014-05-15 19:12:39.000000000 +0200 ++++ qttools-opensource-src-5.3.0-system-clucene/src/assistant/clucene/qclucene-config_p.h 2014-05-30 01:43:02.000000000 +0200 +@@ -15,6 +15,8 @@ + ** + ****************************************************************************/ + ++#error This header must not be included when building against system CLucene. ++ + #ifndef QCLUCENE_CONFIG_P_H + #define QCLUCENE_CONFIG_P_H + diff -ur qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.0-system-clucene/src/assistant/clucene/qclucene_global_p.h --- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h 2014-05-15 19:12:39.000000000 +0200 -+++ qttools-opensource-src-5.3.0-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-05-30 01:29:04.000000000 +0200 -@@ -29,21 +29,9 @@ ++++ qttools-opensource-src-5.3.0-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-05-30 01:41:25.000000000 +0200 +@@ -29,20 +29,10 @@ // We mean it. // @@ -152,11 +164,11 @@ diff -ur qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h -#else -# include -#endif -- ++#include + QT_BEGIN_NAMESPACE - #ifdef QT_STATIC -@@ -54,52 +42,6 @@ +@@ -54,52 +44,6 @@ # define Q_CLUCENE_EXPORT Q_DECL_IMPORT #endif