Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix dependency version with GCC 8

This commit is contained in:
Martchus 2018-05-08 00:37:14 +02:00
parent 1b0cdc9878
commit 0619814654
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
aboutdialog/aboutdialog.cpp
View File

@ -42,7 +42,7 @@ namespace Dialogs {
* standard information icon will be used.
*/
AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const QString &creator, const QString &version,
std::initializer_list<const char *> dependencyVersions, const QString &website, const QString &description, const QImage &image)
const std::vector<const char *> &dependencyVersions, const QString &website, const QString &description, const QImage &image)
: QDialog(parent)
, m_ui(new Ui::AboutDialog)
{
@ -59,13 +59,11 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const
}
m_ui->creatorLabel->setText(tr("developed by %1").arg(creator.isEmpty() ? QApplication::organizationName() : creator));
m_ui->versionLabel->setText(version.isEmpty() ? QApplication::applicationVersion() : version);
if (!dependencyVersions.size()) {
dependencyVersions = ApplicationUtilities::dependencyVersions;
}
if (dependencyVersions.size()) {
const auto &deps(dependencyVersions.size() ? dependencyVersions : ApplicationUtilities::dependencyVersions2);
if (deps.size()) {
QStringList linkedAgainst;
linkedAgainst.reserve(dependencyVersions.size());
for (const auto &dependencyVersion : dependencyVersions) {
linkedAgainst.reserve(deps.size());
for (const auto &dependencyVersion : deps) {
linkedAgainst << QString::fromUtf8(dependencyVersion);
}
m_ui->versionLabel->setToolTip(QStringLiteral("<p>") % tr("Linked against:") % QStringLiteral("</p><ul><li>")
@ -92,6 +90,12 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const
{
}
AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const QString &creator, const QString &version,
std::initializer_list<const char *> dependencyVersions, const QString &website, const QString &description, const QImage &image)
: AboutDialog(parent, applicationName, creator, version, std::vector<const char *>(dependencyVersions), website, description, image)
{
}
/*!
* \brief Constructs an about dialog with the specified \a parent, \a
* description and \a image.

3
aboutdialog/aboutdialog.h
View File

@ -24,6 +24,9 @@ public:
explicit AboutDialog(QWidget *parent, const QString &applicationName, const QString &creator, const QString &version,
std::initializer_list<const char *> dependencyVersions, const QString &website = QString(), const QString &description = QString(),
const QImage &image = QImage());
explicit AboutDialog(QWidget *parent, const QString &applicationName, const QString &creator, const QString &version,
const std::vector<const char *> &dependencyVersions, const QString &website = QString(), const QString &description = QString(),
const QImage &image = QImage());
explicit AboutDialog(QWidget *parent, const QString &description = QString(), const QImage &image = QImage());
~AboutDialog();