rpms/qt5-qttools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

#include <CLucene/StdHeader.h>

Browse Source
This commit is contained in:
Kevin Kofler 2014-05-30 01:45:56 +02:00
parent 9c37211a5b
commit d154d32bec
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qttools-opensource-src-5.3.0-system-clucene.patch
View File

@ -131,10 +131,22 @@ diff -ur qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri q
#Header files #Header files
HEADERS += qclucene_global_p.h \ 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 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/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 +++ qttools-opensource-src-5.3.0-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-05-30 01:41:25.000000000 +0200
@@ -29,21 +29,9 @@ @@ -29,20 +29,10 @@
// We mean it. // We mean it.
// //
@ -152,11 +164,11 @@ diff -ur qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h
-#else -#else
-# include <qt_windows.h> -# include <qt_windows.h>
-#endif -#endif
- +#include <CLucene/StdHeader.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QT_STATIC @@ -54,52 +44,6 @@
@@ -54,52 +42,6 @@
# define Q_CLUCENE_EXPORT Q_DECL_IMPORT # define Q_CLUCENE_EXPORT Q_DECL_IMPORT
#endif #endif