tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bitrot in the --disable-webkit option

Browse Source
This commit is contained in:
Jean-Francois Dockes 2017-09-07 16:57:14 +02:00
parent 6f2dfa823f
commit 9d8c2fdc89
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qtgui/recoll.pro.in
View File

@ -6,6 +6,8 @@ DEFINES += BUILDING_RECOLL
@QMAKE_ENABLE_WEBKIT@ QT += webkit @QMAKE_ENABLE_WEBKIT@ QT += webkit
@QMAKE_DISABLE_WEBKIT@ QMAKE_CXXFLAGS += -DRESLIST_TEXTBROWSER -DSNIPPETS_TEXTBROWSER @QMAKE_DISABLE_WEBKIT@ QMAKE_CXXFLAGS += -DRESLIST_TEXTBROWSER -DSNIPPETS_TEXTBROWSER
@QMAKE_DISABLE_WEBKIT@ DEFINES += RESLIST_TEXTBROWSER
@QMAKE_DISABLE_WEBKIT@ DEFINES += SNIPPETS_TEXTBROWSER
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
@QMAKE_ENABLE_ZEITGEIST@ QT += dbus @QMAKE_ENABLE_ZEITGEIST@ QT += dbus

6
src/qtgui/reslist.cpp
View File

@ -289,9 +289,9 @@ ResList::ResList(QWidget* parent, const char* name)
setObjectName(name); setObjectName(name);
#ifdef RESLIST_TEXTBROWSER #ifdef RESLIST_TEXTBROWSER
LOGDEB("Reslist: using QTextBrowser\n" ); LOGDEB("Reslist: using QTextBrowser\n" );
setReadOnly(TRUE); setReadOnly(true);
setUndoRedoEnabled(FALSE); setUndoRedoEnabled(false);
setOpenLinks(FALSE); setOpenLinks(false);
setTabChangesFocus(true); setTabChangesFocus(true);
// signals and slots connections // signals and slots connections
connect(this, SIGNAL(anchorClicked(const QUrl &)), connect(this, SIGNAL(anchorClicked(const QUrl &)),

6
src/qtgui/snippets_w.cpp
View File

@ -97,9 +97,9 @@ void SnippetsW::init()
verticalLayout->insertWidget(0, browserw); verticalLayout->insertWidget(0, browserw);
connect(browser, SIGNAL(anchorClicked(const QUrl &)), connect(browser, SIGNAL(anchorClicked(const QUrl &)),
this, SLOT(linkWasClicked(const QUrl &))); this, SLOT(linkWasClicked(const QUrl &)));
browser->setReadOnly(TRUE); browser->setReadOnly(true);
browser->setUndoRedoEnabled(FALSE); browser->setUndoRedoEnabled(false);
browser->setOpenLinks(FALSE); browser->setOpenLinks(false);
browser->setTabChangesFocus(true); browser->setTabChangesFocus(true);
if (prefs.reslistfontfamily.length()) { if (prefs.reslistfontfamily.length()) {
QFont nfont(prefs.reslistfontfamily, prefs.reslistfontsize); QFont nfont(prefs.reslistfontfamily, prefs.reslistfontsize);