Updated bibletime to version 3.0

Changes from release notes:

Enhancements:

    * Text windows now have continuous scrolling from the beginning to end of
      a module. At the end of a chapter just keep scrolling to see the next
      chapter.
    * You don't have to open the Personal Commentary for writing. Edit it in a
      normal text window or even when it is a parallel column in a text window.
    * Automatic text scrolling up or down with variable speed and pause.
    * Copy to clipboard by choosing the beginning and ending reference.
    * A search filter was added in the "Install Works" page of the Bookshelf
      Manager.
    * You can select text from a single column when using parallel texts in a
      window.
    * Added a user interface to delete or create search indices.
    * The first time the Bookshelf Manager is used in a session, the remote
      libraries are updated.
    * Improved popup menus and icons for module chooser buttons and text
      window headers.
    * Show module unlock information in about text when available.
    * Improved unlocking of modules.

Bugs fixed:

    * Locked Bible not unlocking properly.
    * Place not being saved in Daily Devotional.
    * Problems with MAG window references using hebrew modules OSHB and OSMHB.
    * Unable to create a search scope for deuterocanonical books.
    * Searching with quotes not working.
    * MAG windows Strongs references not working unless config settings were
      saved.

20 files changed, 336 insertions, 0 deletions

diff --git a/misc/bibletime/patches/patch-cmake_BTApplication.cmake b/misc/bibletime/patches/patch-cmake_BTApplication.cmake
new file mode 100644
index 00000000000..d14f48cd7ca
--- /dev/null
+++ b/misc/bibletime/patches/patch-cmake_BTApplication.cmake
@@ -0,0 +1,20 @@
+$NetBSD: patch-cmake_BTApplication.cmake,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* don't install DisplayView.qml in bin
+ taken from upstream https://github.com/bibletime/bibletime/commit/7700e93a345c202cd45cd4e72b77feb64fe33b80
+
+--- cmake/BTApplication.cmake.orig	2020-08-02 18:32:25.000000000 +0000
++++ cmake/BTApplication.cmake
+@@ -178,10 +178,10 @@ INSTALL(FILES "docs/license.html"
+ # See QTBUG-55259, Affects windeployqt and macdeployqt
+ IF(APPLE)
+     INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml"
+-        DESTINATION "${BT_BINDIR}/BibleTime.app/Contents/MacOS")
++        DESTINATION "${BT_BINDIR}/BibleTime.app/share/bibletime/qml")
+ ELSE()
+     INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml"
+-        DESTINATION "${BT_BINDIR}/")
++        DESTINATION "${BT_DATAROOTDIR}/bibletime/qml")
+ ENDIF()
+ 
+ FILE(GLOB INSTALL_TMPL_LIST
diff --git a/misc/bibletime/patches/patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp b/misc/bibletime/patches/patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp
new file mode 100644
index 00000000000..4e0e6a9140c
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/backend/bookshelfmodel/btbookshelftreemodel.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/backend/bookshelfmodel/btbookshelftreemodel.cpp
+@@ -214,7 +214,7 @@ bool BtBookshelfTreeModel::setData(const
+ 
+ Qt::ItemFlags BtBookshelfTreeModel::flags(const QModelIndex & index) const {
+     if (!index.isValid())
+-        return nullptr;
++        return Qt::ItemFlags();
+ 
+     Qt::ItemFlags f(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ 
diff --git a/misc/bibletime/patches/patch-src_backend_managers_clanguagemgr.h b/misc/bibletime/patches/patch-src_backend_managers_clanguagemgr.h
new file mode 100644
index 00000000000..aa7643801b9
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_backend_managers_clanguagemgr.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_backend_managers_clanguagemgr.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/72adbba869a14be47967d7e5d877d0e7c49f0375
+
+--- src/backend/managers/clanguagemgr.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/backend/managers/clanguagemgr.h
+@@ -163,7 +163,7 @@ class CLanguageMgr {
+     private:
+         void init();
+         inline const QStringList makeStringList(const QString& abbrevs) {
+-            return abbrevs.split( ";", QString::KeepEmptyParts, Qt::CaseSensitive );
++            return abbrevs.split( ";", Qt::KeepEmptyParts, Qt::CaseSensitive );
+         }
+ 
+         Language m_defaultLanguage;
diff --git a/misc/bibletime/patches/patch-src_frontend_bibletime.cpp b/misc/bibletime/patches/patch-src_frontend_bibletime.cpp
new file mode 100644
index 00000000000..09d10ef49ec
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_bibletime.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_bibletime.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/bibletime.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/bibletime.cpp
+@@ -92,7 +92,7 @@ BibleTime::BibleTime(QWidget *parent, Qt
+         if (!pm.load(splashImage)) {
+             qWarning("Can't load startuplogo! Check your installation.");
+         }
+-        splash = new QSplashScreen(this, pm);
++        splash = new QSplashScreen(pm);
+         splash->setAttribute(Qt::WA_DeleteOnClose);
+         splash->finish(this);
+         splash->showMessage(splashHtml.arg(tr("Initializing the SWORD engine...")),
diff --git a/misc/bibletime/patches/patch-src_frontend_bibletime.h b/misc/bibletime/patches/patch-src_frontend_bibletime.h
new file mode 100644
index 00000000000..4adc2692d00
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_bibletime.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_bibletime.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/bibletime.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/bibletime.h
+@@ -138,7 +138,7 @@ class BibleTime : public QMainWindow {
+ 
+     public:
+ 
+-        BibleTime(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr);
++        BibleTime(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
+ 
+         ~BibleTime() override;
+ 
diff --git a/misc/bibletime/patches/patch-src_frontend_bookshelfwizard_btbookshelfwizard.h b/misc/bibletime/patches/patch-src_frontend_bookshelfwizard_btbookshelfwizard.h
new file mode 100644
index 00000000000..e14e8f1b1c9
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_bookshelfwizard_btbookshelfwizard.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_bookshelfwizard_btbookshelfwizard.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/bookshelfwizard/btbookshelfwizard.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/bookshelfwizard/btbookshelfwizard.h
+@@ -38,7 +38,7 @@ class BtBookshelfWizard final: public QW
+ 
+ public: /* Methods: */
+ 
+-    BtBookshelfWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
++    BtBookshelfWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
+ 
+     QStringList selectedSources() const;
+     QStringList selectedLanguages() const;
diff --git a/misc/bibletime/patches/patch-src_frontend_btaboutmoduledialog.h b/misc/bibletime/patches/patch-src_frontend_btaboutmoduledialog.h
new file mode 100644
index 00000000000..977b25e00b0
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_btaboutmoduledialog.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_btaboutmoduledialog.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/btaboutmoduledialog.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/btaboutmoduledialog.h
+@@ -31,7 +31,7 @@ class BTAboutModuleDialog: public QDialo
+ 
+         BTAboutModuleDialog(const CSwordModuleInfo *moduleInfo,
+                             QWidget *parent = nullptr,
+-                            Qt::WindowFlags flags = nullptr);
++                            Qt::WindowFlags flags = Qt::WindowFlags());
+ 
+     protected: /* Methods: */
+ 
diff --git a/misc/bibletime/patches/patch-src_frontend_btbookshelfdockwidget.h b/misc/bibletime/patches/patch-src_frontend_btbookshelfdockwidget.h
new file mode 100644
index 00000000000..f97d516cbe4
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_btbookshelfdockwidget.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_btbookshelfdockwidget.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/btbookshelfdockwidget.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/btbookshelfdockwidget.h
+@@ -29,7 +29,7 @@ class QStackedWidget;
+ class BtBookshelfDockWidget: public QDockWidget {
+         Q_OBJECT
+     public:
+-        BtBookshelfDockWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
++        BtBookshelfDockWidget(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+ 
+         static inline BtBookshelfDockWidget *getInstance() { return m_instance; }
+ 
diff --git a/misc/bibletime/patches/patch-src_frontend_btbookshelfwidget.h b/misc/bibletime/patches/patch-src_frontend_btbookshelfwidget.h
new file mode 100644
index 00000000000..ad17adc6222
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_btbookshelfwidget.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_btbookshelfwidget.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/btbookshelfwidget.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/btbookshelfwidget.h
+@@ -34,7 +34,7 @@ class QToolButton;
+ class BtBookshelfWidget: public QWidget {
+     Q_OBJECT
+     public:
+-        explicit BtBookshelfWidget(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr);
++        explicit BtBookshelfWidget(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
+ 
+         void setSourceModel(QAbstractItemModel *model);
+ 
diff --git a/misc/bibletime/patches/patch-src_frontend_btmodulechooserdialog.h b/misc/bibletime/patches/patch-src_frontend_btmodulechooserdialog.h
new file mode 100644
index 00000000000..3799b11d9df
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_btmodulechooserdialog.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_btmodulechooserdialog.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/btmodulechooserdialog.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/btmodulechooserdialog.h
+@@ -26,7 +26,7 @@ class BtModuleChooserDialog : public QDi
+     Q_OBJECT
+ 
+     protected:
+-        explicit BtModuleChooserDialog(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr);
++        explicit BtModuleChooserDialog(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
+ 
+         void retranslateUi();
+ 
diff --git a/misc/bibletime/patches/patch-src_frontend_cmdiarea.h b/misc/bibletime/patches/patch-src_frontend_cmdiarea.h
new file mode 100644
index 00000000000..35fa7719179
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_cmdiarea.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_cmdiarea.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/cmdiarea.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/cmdiarea.h
+@@ -55,7 +55,7 @@ class CMDIArea: public QMdiArea {
+           Reimplementation of QMdiArea::addSubWindow().
+         */
+         QMdiSubWindow * addSubWindow(QWidget * widget,
+-                                     Qt::WindowFlags windowFlags = nullptr);
++                                     Qt::WindowFlags windowFlags = Qt::WindowFlags());
+ 
+         /**
+           Returns the BibleTime main window
diff --git a/misc/bibletime/patches/patch-src_frontend_display_modelview_btquickwidget.cpp b/misc/bibletime/patches/patch-src_frontend_display_modelview_btquickwidget.cpp
new file mode 100644
index 00000000000..bec87940d8e
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_display_modelview_btquickwidget.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_display_modelview_btquickwidget.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* don't install DisplayView.qml in bin
+ taken from upstream https://github.com/bibletime/bibletime/commit/7700e93a345c202cd45cd4e72b77feb64fe33b80
+
+--- src/frontend/display/modelview/btquickwidget.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/display/modelview/btquickwidget.cpp
+@@ -36,7 +36,7 @@ BtQuickWidget::BtQuickWidget(BtQmlScroll
+     setAcceptDrops(true);
+ 
+     namespace DU = util::directory;
+-    QString qmlFile = QCoreApplication::applicationDirPath() + "/" + "DisplayView.qml";
++    QString qmlFile = QCoreApplication::applicationDirPath() + "/../share/bibletime/qml/" + "DisplayView.qml";
+     setSource(QUrl::fromLocalFile(qmlFile));
+     setupScrollTimer();
+ }
diff --git a/misc/bibletime/patches/patch-src_frontend_displaywindow_creadwindow.cpp b/misc/bibletime/patches/patch-src_frontend_displaywindow_creadwindow.cpp
new file mode 100644
index 00000000000..9ef134c6488
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_displaywindow_creadwindow.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_displaywindow_creadwindow.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/72adbba869a14be47967d7e5d877d0e7c49f0375
+
+--- src/frontend/displaywindow/creadwindow.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/displaywindow/creadwindow.cpp
+@@ -120,7 +120,7 @@ void CReadWindow::openSearchStrongsDialo
+     Q_FOREACH(QString const & strongNumber,
+               displayWidget()->getCurrentNodeInfo().split(
+                   '|',
+-                  QString::SkipEmptyParts))
++                  Qt::SkipEmptyParts))
+         searchText.append("strong:").append(strongNumber).append(' ');
+     Search::CSearchDialog::openDialog(modules(), searchText, nullptr);
+ }
diff --git a/misc/bibletime/patches/patch-src_frontend_edittextwizard_btedittextwizard.h b/misc/bibletime/patches/patch-src_frontend_edittextwizard_btedittextwizard.h
new file mode 100644
index 00000000000..5cb608a1232
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_edittextwizard_btedittextwizard.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_edittextwizard_btedittextwizard.h,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/edittextwizard/btedittextwizard.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/edittextwizard/btedittextwizard.h
+@@ -26,7 +26,7 @@ class BtEditTextWizard final: public QWi
+ 
+ public: /* Methods: */
+ 
+-    BtEditTextWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
++    BtEditTextWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
+ 
+     bool htmlMode() const;
+     void setFont(const QFont& font);
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_cbookkeychooser.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_cbookkeychooser.cpp
new file mode 100644
index 00000000000..edba6e26f4a
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_keychooser_cbookkeychooser.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_keychooser_cbookkeychooser.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/72adbba869a14be47967d7e5d877d0e7c49f0375
+
+--- src/frontend/keychooser/cbookkeychooser.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/keychooser/cbookkeychooser.cpp
+@@ -66,7 +66,7 @@ void CBookKeyChooser::setKey(CSwordKey *
+ 
+     QStringList siblings; // Split up key
+     if (m_key && !oldKey.isEmpty())
+-        siblings = oldKey.split('/', QString::SkipEmptyParts);
++        siblings = oldKey.split('/', Qt::SkipEmptyParts);
+ 
+     int depth = 0;
+ 
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_ckeychooserwidget.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_ckeychooserwidget.cpp
new file mode 100644
index 00000000000..0fedda391ef
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_keychooser_ckeychooserwidget.cpp
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_frontend_keychooser_ckeychooserwidget.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/keychooser/ckeychooserwidget.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/keychooser/ckeychooserwidget.cpp
+@@ -67,17 +67,17 @@ bool CKCComboBox::eventFilter(QObject * 
+             return false;
+ 
+         if (f->reason() == Qt::ActiveWindowFocusReason) {
+-            emit activated(currentText());
++            emit textActivated(currentText());
+             return false;
+         }
+ 
+         if (f->reason() == Qt::MouseFocusReason) {
+-            emit activated(currentText());
++            emit textActivated(currentText());
+             return false;
+         }
+ 
+         if (o == this) {
+-            emit activated(currentText());
++            emit textActivated(currentText());
+             return false;
+         }
+     }
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_cscrollerwidgetset.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_cscrollerwidgetset.cpp
new file mode 100644
index 00000000000..639d0af3ae7
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_keychooser_cscrollerwidgetset.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_keychooser_cscrollerwidgetset.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/keychooser/cscrollerwidgetset.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/keychooser/cscrollerwidgetset.cpp
+@@ -75,7 +75,7 @@ void CScrollerWidgetSet::setToolTips(con
+ 
+ 
+ void CScrollerWidgetSet::wheelEvent(QWheelEvent * e) {
+-    int const delta = e->delta();
++    int const delta = e->angleDelta().y();
+     if (delta == 0) {
+         e->ignore();
+     } else {
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp
new file mode 100644
index 00000000000..722f1de44e3
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp,v 1.1 2020/12/04 12:17:59 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
+@@ -49,7 +49,7 @@ void BtDropdownChooserButton::mousePress
+ }
+ 
+ void BtDropdownChooserButton::wheelEvent(QWheelEvent * e) {
+-    int const delta = e->delta();
++    int const delta = e->angleDelta().y();
+     if (delta == 0) {
+         e->ignore();
+     } else {
diff --git a/misc/bibletime/patches/patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h b/misc/bibletime/patches/patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h
new file mode 100644
index 00000000000..59f7db42e35
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h,v 1.1 2020/12/04 12:17:59 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/searchdialog/btsearchmodulechooserdialog.h.orig	2020-11-28 18:53:24.250680326 +0000
++++ src/frontend/searchdialog/btsearchmodulechooserdialog.h
+@@ -26,7 +26,7 @@ class BtSearchModuleChooserDialog: publi
+     Q_OBJECT
+     public:
+         BtSearchModuleChooserDialog(QWidget *parent = nullptr,
+-                                    Qt::WindowFlags flags = nullptr);
++                                    Qt::WindowFlags flags = Qt::WindowFlags());
+ 
+         inline void setCheckedModules(BtConstModuleSet const & modules)
+         { bookshelfWidget()->treeModel()->setCheckedModules(modules); }
diff --git a/misc/bibletime/patches/patch-src_frontend_settingsdialogs_btconfigdialog.h b/misc/bibletime/patches/patch-src_frontend_settingsdialogs_btconfigdialog.h
new file mode 100644
index 00000000000..3528f3208cd
--- /dev/null
+++ b/misc/bibletime/patches/patch-src_frontend_settingsdialogs_btconfigdialog.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_frontend_settingsdialogs_btconfigdialog.h,v 1.1 2020/12/04 12:17:59 nros Exp $
+
+* remove deprecation warning
+ taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
+
+--- src/frontend/settingsdialogs/btconfigdialog.h.orig	2020-08-02 18:32:25.000000000 +0000
++++ src/frontend/settingsdialogs/btconfigdialog.h
+@@ -72,7 +72,7 @@ public: /* Types: */
+ public: /* Methods: */
+ 
+     BtConfigDialog(QWidget * const parent = nullptr,
+-                   Qt::WindowFlags const flags = 0);
++                   Qt::WindowFlags const flags = Qt::WindowFlags());
+ 
+     /** Adds a BtConfigPage to the paged widget stack. The new page will be the current page.*/
+     void addPage(Page * const pageWidget);