From e14c4085029e89da0006a83e72e20e8da29092fd Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Thu, 28 Jul 2011 17:01:34 +0200 Subject: [PATCH 2/3] use system hunspell instead of bundled one --- spellerutility.h | 2 +- texstudio.pro | 38 +++++++------------------------------- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git spellerutility.h spellerutility.h index 730920e..bb996e2 100644 --- spellerutility.h +++ spellerutility.h @@ -13,7 +13,7 @@ #include "mostQtHeaders.h" -#include "hunspell/hunspell.hxx" +#include class SpellerUtility: public QObject { Q_OBJECT public: diff --git texstudio.pro texstudio.pro index 437a376..c0b67da 100644 --- texstudio.pro +++ texstudio.pro @@ -55,24 +55,6 @@ HEADERS += texmaker.h \ codesnippet.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 \ qcodeedit/lib/qeditorinputbinding.h \ qcodeedit/lib/qeditorinputbindinginterface.h \ randomtextgenerator.h \ @@ -88,7 +70,6 @@ HEADERS += texmaker.h \ latexdocument.h \ unicodeinsertion.h \ universalinputdialog.h \ - hunspell/replist.hxx \ scriptengine.h \ insertgraphics.h \ tmxtabwidget.h \ @@ -142,18 +123,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 \ randomtextgenerator.cpp \ @@ -528,3 +497,10 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c #QMAKE_CXXFLAGS_DEBUG += -Werror -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline + +# enable use of pkgconfig +unix { + CONFIG += link_pkgconfig + # use system hunspell + PKGCONFIG += hunspell +} \ No newline at end of file -- 1.7.4.4