show sqlite version in about (closes #31911)

qgis · Sep 21, 2019 · 766db97 · 766db97
1 parent fc77b9e
commit 766db97
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4648,7 +4648,7 @@ void QgisApp::about()
     QString versionString = QStringLiteral( "<html><body><div align='center'><table width='100%'>" );
 
     versionString += QLatin1String( "<tr>" );
-    versionString += "<td>" + tr( "QGIS version" )       + "</td><td>" + Qgis::QGIS_VERSION + "</td><td>";
+    versionString += "<td>" + tr( "QGIS version" ) + "</td><td>" + Qgis::QGIS_VERSION + "</td><td>";
 
 
     if ( QString( Qgis::QGIS_DEV_VERSION ) == QLatin1String( "exported" ) )
@@ -4678,6 +4678,11 @@ void QgisApp::about()
 
     versionString += QLatin1String( "</tr><tr>" );
 
+    versionString += "<td>" + tr( "Compiled against SQLite" ) + "</td><td>" + SQLITE_VERSION + "</td>";
+    versionString += "<td>" + tr( "Running against SQLite" ) + "</td><td>" + sqlite3_libversion() + "</td>";
+
+    versionString += QLatin1String( "</tr><tr>" );
+
     versionString += "<td>" + tr( "PostgreSQL Client Version" ) + "</td><td>";
 #ifdef HAVE_POSTGRESQL
     versionString += QStringLiteral( PG_VERSION );
@@ -4705,13 +4710,19 @@ void QgisApp::about()
     versionString += "<td>" + tr( "PROJ.4 Version" ) + "</td><td colspan=3>" + QString::number( PJ_VERSION ) + "</td>";
 #endif
 
-#ifdef QGISDEBUG
-    versionString += "</tr><tr><td colspan=4>" + tr( "This copy of QGIS writes debugging output." ) + "</td>";
+    versionString += QLatin1String( "</tr><tr>" );
+
+    versionString += "<td>" + tr( "OS Version" ) + "</td><td";
+
+#ifndef QGISDEBUG
+    versionString += " colspan=3";
 #endif
 
-    versionString += QLatin1String( "</tr><tr>" );
+    versionString += ">" + QSysInfo::prettyProductName() + "</td>";
 
-    versionString += "<td>" + tr( "OS Version" ) + "</td><td>" + QSysInfo::prettyProductName() + "</td>";
+#ifdef QGISDEBUG
+    versionString += "<td colspan=2>" + tr( "This copy of QGIS writes debugging output." ) + "</td>";
+#endif
 
     versionString += QLatin1String( "</tr></table></div></body></html>" );
 

diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui
@@ -224,6 +224,9 @@ p, li { white-space: pre-wrap; }
            </item>
            <item>
             <widget class="QTextBrowser" name="txtVersion">
+             <property name="lineWrapMode">
+              <enum>QTextEdit::NoWrap</enum>
+             </property>
              <property name="openExternalLinks">
               <bool>true</bool>
              </property>