Skip to content

Commit 79d3284

Browse files
authored
Merge pull request #3231 from softins/qt-version-display
Show both build and runtime versions of Qt
2 parents 684c0c3 + 5006a05 commit 79d3284

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

src/util.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,8 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : CBaseDlg ( parent )
594594

595595
// libraries used by this compilation
596596
txvLibraries->setText ( tr ( "This app uses the following libraries, resources or code snippets:" ) + "<p>" +
597-
tr ( "Qt cross-platform application framework" ) + QString ( " %1" ).arg ( QT_VERSION_STR ) +
597+
tr ( "Qt cross-platform application framework" ) + QString ( " %1 " ).arg ( QT_VERSION_STR ) + tr ( "(build)" ) +
598+
QString ( ", %1 " ).arg ( qVersion() ) + tr ( "(runtime)" ) +
598599
", <i><a href=\"https://www.qt.io\">https://www.qt.io</a></i>"
599600
"</p>"
600601
"<p>"
@@ -1726,7 +1727,8 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui )
17261727

17271728
strVersionText += "\n *** " + QCoreApplication::tr ( "This app uses the following libraries, resources or code snippets:" );
17281729
strVersionText += "\n *** ";
1729-
strVersionText += "\n *** " + QCoreApplication::tr ( "Qt cross-platform application framework" ) + QString ( " %1" ).arg ( QT_VERSION_STR );
1730+
strVersionText += "\n *** " + QCoreApplication::tr ( "Qt cross-platform application framework" ) + QString ( " %1 " ).arg ( QT_VERSION_STR ) +
1731+
QCoreApplication::tr ( "(build)" ) + QString ( ", %1 " ).arg ( qVersion() ) + QCoreApplication::tr ( "(runtime)" );
17301732
strVersionText += "\n *** <https://www.qt.io>";
17311733
strVersionText += "\n *** ";
17321734
strVersionText += "\n *** Opus Interactive Audio Codec";

0 commit comments

Comments
 (0)