commit a09eaf448ca8309556923a4a01aeb4a3cd430c1d
Author: Stephan Witt <[email protected]>
Date: Sat Oct 18 16:06:33 2014 +0200
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 c75fec0..e9e88ea 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;
}