--- texmaker.pro.orig 2015-10-31 18:46:29.341291879 -0400
+++ texmaker.pro 2015-10-31 18:49:15.178743971 -0400
@@ -19,11 +19,14 @@
unix:!macx {
contains( QT_VERSION, "^5.*" ) {
CONFIG += link_pkgconfig
-PKGCONFIG = poppler-qt5
+PKGCONFIG = poppler-qt5 hunspell
+
+CONFIG += qtsingleapplication
+
DEFINES += POPPLER24
} else {
CONFIG += link_pkgconfig
-PKGCONFIG = poppler-qt4
+PKGCONFIG = poppler-qt4 hunspell
DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
contains( DETECTEDPOPPLER, "^0.18.*" ){
DEFINES += OLDPOPPLER
@@ -98,29 +101,6 @@
unicodeview.h \
quickbeamerdialog.h \
svnhelper.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/replist.hxx \
- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
- singleapp/qtsinglecoreapplication.h \
encodingprober/CharDistribution.h \
encodingprober/ChineseGroupProber.h \
encodingprober/ctype_test_p.h \
@@ -210,22 +190,6 @@
unicodeview.cpp \
quickbeamerdialog.cpp \
svnhelper.cpp \
- hunspell/affentry.cxx \
- hunspell/affixmgr.cxx \
- hunspell/csutil.cxx \
- hunspell/dictmgr.cxx \
- hunspell/hashmgr.cxx \
- hunspell/hunspell.cxx \
- hunspell/phonet.cxx \
- hunspell/suggestmgr.cxx \
- hunspell/utf_info.cxx \
- hunspell/filemgr.cxx \
- hunspell/replist.cxx \
- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
- singleapp/qtsinglecoreapplication.cpp \
encodingprober/CharDistribution.cpp \
encodingprober/ChineseGroupProber.cpp \
encodingprober/JapaneseGroupProber.cpp \
@@ -336,8 +300,7 @@
INSTALLS = target
HEADERS += x11fontdialog.h
-SOURCES += x11fontdialog.cpp \
- singleapp/qtlockedfile_unix.cpp
+SOURCES += x11fontdialog.cpp
FORMS += x11fontdialog.ui
utilities.files = doc/doc1.png \