Skip to content

Commit

Permalink
Show current platform and destination platform information
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
MKleusberg authored and mgrojo committed Feb 17, 2019
1 parent be20f62 commit 8f36d1b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/AboutDialog.cpp
Expand Up @@ -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
);
Expand Down
9 changes: 5 additions & 4 deletions src/MainWindow.cpp
Expand Up @@ -2354,6 +2354,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);
Expand All @@ -2370,10 +2371,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");
Expand Down

0 comments on commit 8f36d1b

Please sign in to comment.