1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
spellerutility.h | 2 +-
texstudio.pro | 45 ++++++++++++---------------------------------
2 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/spellerutility.h b/spellerutility.h
index 7e1b980..b0bc8b8 100644
--- a/spellerutility.h
+++ b/spellerutility.h
@@ -13,7 +13,7 @@
#include "mostQtHeaders.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
class SpellerUtility: public QObject {
Q_OBJECT
public:
diff --git a/texstudio.pro b/texstudio.pro
index b073255..3d4ee64 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -53,25 +53,6 @@ HEADERS += texmaker.h \
debughelper.h \
thesaurusdialog.h \
xmltagslistwidget.h \
- hunspell/affentry.hxx \
- hunspell/affixmgr.hxx \
- hunspell/atypes.hxx \
- hunspell/baseaffix.hxx \
- hunspell/csutil.hxx \
- hunspell/dictmgr.hxx \
- hunspell/hashmgr.hxx \
- hunspell/htypes.hxx \
- hunspell/hunspell.hxx \
- hunspell/hunspell.h \
- hunspell/langnum.hxx \
- hunspell/license.hunspell \
- hunspell/phonet.hxx \
- hunspell/suggestmgr.hxx \
- hunspell/license.myspell \
- hunspell/filemgr.hxx \
- hunspell/hunzip.hxx \
- hunspell/w_char.hxx \
- hunspell/replist.hxx \
qcodeedit/lib/qeditorinputbinding.h \
qcodeedit/lib/qeditorinputbindinginterface.h \
qcodeedit/lib/qformat.h \
@@ -171,18 +152,6 @@ SOURCES += main.cpp \
codesnippet.cpp \
thesaurusdialog.cpp \
xmltagslistwidget.cpp \
- hunspell/affentry.cxx \
- hunspell/affixmgr.cxx \
- hunspell/csutil.cxx \
- hunspell/dictmgr.cxx \
- hunspell/hashmgr.cxx \
- hunspell/hunspell.cxx \
- hunspell/phonet.cxx \
- hunspell/replist.cxx \
- hunspell/suggestmgr.cxx \
- hunspell/utf_info.cxx \
- hunspell/filemgr.cxx \
- hunspell/hunzip.cxx \
encodingdialog.cpp \
qcodeedit/lib/qeditorinputbinding.cpp \
qcodeedit/lib/qformat.cpp \
@@ -537,10 +506,14 @@ SOURCES += qcodeedit/lib/qnfa/qnfa.cpp \
# ###############################
# ##########QUAZIP###############
-DEFINES += QUAZIP_STATIC
+#DEFINES += QUAZIP_STATIC
# Input
-include(quazip/quazip/quazip.pri)
+#include(quazip/quazip/quazip.pri)
+unix {
+ INCLUDEPATH += $${PREFIX}/include/quazip
+ LIBS += -lquazip
+}
# ###############################
@@ -677,3 +650,9 @@ else {
QMAKE_LFLAGS_RELEASE -= -Wl,-s
}
+unix {
+ CONFIG += link_pkgconfig
+ # use system quazip
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
|
GitWeb