From 2efcbb74d6257f50e4a32731629086bafeeb64b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Mon, 29 Jun 2009 08:44:32 +0000 Subject: [PATCH] * do not change name of QSettings config file on LyX version change. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30301 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiApplication.cpp | 5 +++-- src/version.cpp | 3 +++ src/version.h | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index ade73a6dd9..cdee48bfbd 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -714,12 +714,13 @@ GuiApplication::~GuiApplication() GuiApplication::GuiApplication(int & argc, char ** argv) - : QApplication(argc, argv), current_view_(0), d(new GuiApplication::Private) + : QApplication(argc, argv), current_view_(0), + d(new GuiApplication::Private) { QString app_name = "LyX"; QCoreApplication::setOrganizationName(app_name); QCoreApplication::setOrganizationDomain("lyx.org"); - QCoreApplication::setApplicationName(app_name + "-" + lyx_version); + QCoreApplication::setApplicationName(lyx_package); // Install translator for GUI elements. installTranslator(&d->qt_trans_); diff --git a/src/version.cpp b/src/version.cpp index ccd44281f9..0bc2be0457 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -16,5 +16,8 @@ char const * lyx_version = PACKAGE_VERSION; /// char const * lyx_release_date = LYX_DATE; +/// Package identifier (lyx[-]) +char const * lyx_package = PACKAGE; + /// This is the version information shown by 'lyx --version' char const * lyx_version_info = VERSION_INFO; diff --git a/src/version.h b/src/version.h index b13632fe54..864b212141 100644 --- a/src/version.h +++ b/src/version.h @@ -19,6 +19,9 @@ extern char const * lyx_version; /// extern char const * lyx_release_date; +/// Package identifier (lyx[-]) +extern char const * lyx_package; + /// This is the version information shown by 'lyx -version' extern char const * lyx_version_info;