From 79ffd779b92a1e2093ad6ce7052b33d8d152141d Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Tue, 25 Dec 2018 19:42:55 +0100 Subject: [PATCH] Show current platform and destination platform information Add the destination platform from the compilation process and the platform we are running on to the About dialog and the Bug Report template text. See issue #1660. --- src/AboutDialog.cpp | 1 + src/MainWindow.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index b3907ddf..c38ea72a 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -19,6 +19,7 @@ AboutDialog::AboutDialog(QWidget *parent) : sqlite_version = tr("SQLCipher Version ") + sqlcipher_version + tr(" (based on SQLite %1)").arg(sqlite_version); ui->label_version->setText(tr("Version ") + Application::versionString() + "\n\n" + + tr("Built for ") + QSysInfo::buildAbi() + ", running on " + QSysInfo::currentCpuArchitecture() + "\n\n" + tr("Qt Version ") + QT_VERSION_STR + "\n\n" + sqlite_version ); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index c8afeb33..37e875ad 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -2367,6 +2367,7 @@ void MainWindow::on_actionBug_report_triggered() const QString kernelType = QSysInfo::kernelType(); const QString kernelVersion = QSysInfo::kernelVersion(); const QString arch = QSysInfo::currentCpuArchitecture(); + const QString built_for = QSysInfo::buildAbi(); QString sqlite_version, sqlcipher_version; DBBrowserDB::getSqliteVersion(sqlite_version, sqlcipher_version); @@ -2383,10 +2384,10 @@ void MainWindow::on_actionBug_report_triggered() "#### What did you see instead?\n\n\n" "Useful extra information\n" "-------------------------\n" - "> DB4S v%1 on %2 (%3/%4) [%5]\n" - "> using %6\n" - "> and Qt %7") - .arg(version, os, kernelType, kernelVersion, arch, sqlite_version, QT_VERSION_STR); + "> DB4S v%1 [built for %2] on %3 (%4/%5) [%6]\n" + "> using %7\n" + "> and Qt %8") + .arg(version, built_for, os, kernelType, kernelVersion, arch, sqlite_version, QT_VERSION_STR); QUrlQuery query; query.addQueryItem("labels", "bug");