Mercurial > octave

changeset 32278:3de9f020ce41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove requirement of QSqlDatabase header (bug #64580) * documentation.cc (documentation): remove test for qt sqlite module, mention missing sqlite as possible cuase for failing docs data setup instead
author Torsten Lilge <ttl-octave@mailbox.org>
date Sat, 26 Aug 2023 18:03:22 +0200
parents 036fdcd3e7c1
children fbd7e00d3e6e
files libgui/src/documentation.cc
diffstat 1 files changed, 5 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/documentation.cc	Sat Aug 26 13:28:43 2023 +0200
+++ b/libgui/src/documentation.cc	Sat Aug 26 18:03:22 2023 +0200
@@ -48,7 +48,6 @@
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QRegularExpression>
-#include <QSqlDatabase>
 #include <QTabWidget>
 #include <QTimer>
 #include <QWheelEvent>
@@ -127,16 +126,7 @@
 #endif
 
   if (copy_ok)
-    {
-#ifdef ENABLE_DOCS
-      if (!QSqlDatabase::isDriverAvailable(QLatin1String("QSQLITE")))
-        {
-          QMessageBox::warning (this, tr ("Octave Documentation"),
-                                      tr ("SQlite module missing."));
-        }
-#endif
-      m_help_engine->setCollectionFile (m_collection);
-    }
+    m_help_engine->setCollectionFile (m_collection);
   else
 #ifdef ENABLE_DOCS
     // FIXME: Perhaps a better way to do this would be to keep a count
@@ -159,8 +149,10 @@
 #ifdef ENABLE_DOCS
       QMessageBox::warning (this, tr ("Octave Documentation"),
                             tr ("Could not setup the data required for the\n"
-                                "documentation viewer. Only help texts in\n"
-                                "the Command Window will be available."));
+                                "documentation viewer. Maybe the Qt SQlite\n"
+                                "module is missing.\n"
+                                "Only help texts in the Command Window will\n"
+                                "be available."));
 #endif
       disconnect (m_help_engine, 0, 0, 0);