From: Stephan Witt Date: Sat, 18 Oct 2014 14:06:33 +0000 (+0200) Subject: Add Qt-version info to LyX version string when a git repository is present. X-Git-Tag: 2.2.0alpha1~1626 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a09eaf448ca8309556923a4a01aeb4a3cd430c1d;p=features.git Add Qt-version info to LyX version string when a git repository is present. --- diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp index c75fec0180..e9e88eabcf 100644 --- a/src/frontends/qt4/GuiAbout.cpp +++ b/src/frontends/qt4/GuiAbout.cpp @@ -129,11 +129,11 @@ static QString version() out << "\n"; out << qt_("User directory: "); out << toqstr(makeDisplayPath(package().user_support().absFileName())); -#ifdef DEVEL_VERSION - out << "\n"; - out << toqstr(bformat(_("Qt Version (run-time): %1$s"), from_ascii(qVersion()))) << "\n"; - out << toqstr(bformat(_("Qt Version (compile-time): %1$s"), from_ascii(QT_VERSION_STR))) << "\n"; -#endif + if (std::string(lyx_git_commit_hash) != "none") { + out << "\n"; + out << toqstr(bformat(_("Qt Version (run-time): %1$s"), from_ascii(qVersion()))) << "\n"; + out << toqstr(bformat(_("Qt Version (compile-time): %1$s"), from_ascii(QT_VERSION_STR))) << "\n"; + } return res; }