From 9d8c2fdc89f49dbdaff05dba79559573b6ef4ae7 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 7 Sep 2017 16:57:14 +0200 Subject: [PATCH] Fix bitrot in the --disable-webkit option --- src/qtgui/recoll.pro.in | 2 ++ src/qtgui/reslist.cpp | 6 +++--- src/qtgui/snippets_w.cpp | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in index c58105f0..c0c9a08e 100644 --- a/src/qtgui/recoll.pro.in +++ b/src/qtgui/recoll.pro.in @@ -6,6 +6,8 @@ DEFINES += BUILDING_RECOLL @QMAKE_ENABLE_WEBKIT@ QT += webkit @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_ENABLE_ZEITGEIST@ QT += dbus diff --git a/src/qtgui/reslist.cpp b/src/qtgui/reslist.cpp index 651e5f26..ff636f07 100644 --- a/src/qtgui/reslist.cpp +++ b/src/qtgui/reslist.cpp @@ -289,9 +289,9 @@ ResList::ResList(QWidget* parent, const char* name) setObjectName(name); #ifdef RESLIST_TEXTBROWSER LOGDEB("Reslist: using QTextBrowser\n" ); - setReadOnly(TRUE); - setUndoRedoEnabled(FALSE); - setOpenLinks(FALSE); + setReadOnly(true); + setUndoRedoEnabled(false); + setOpenLinks(false); setTabChangesFocus(true); // signals and slots connections connect(this, SIGNAL(anchorClicked(const QUrl &)), diff --git a/src/qtgui/snippets_w.cpp b/src/qtgui/snippets_w.cpp index 6e4dd0ac..4db16bed 100644 --- a/src/qtgui/snippets_w.cpp +++ b/src/qtgui/snippets_w.cpp @@ -97,9 +97,9 @@ void SnippetsW::init() verticalLayout->insertWidget(0, browserw); connect(browser, SIGNAL(anchorClicked(const QUrl &)), this, SLOT(linkWasClicked(const QUrl &))); - browser->setReadOnly(TRUE); - browser->setUndoRedoEnabled(FALSE); - browser->setOpenLinks(FALSE); + browser->setReadOnly(true); + browser->setUndoRedoEnabled(false); + browser->setOpenLinks(false); browser->setTabChangesFocus(true); if (prefs.reslistfontfamily.length()) { QFont nfont(prefs.reslistfontfamily, prefs.reslistfontsize);