From 98048a717ffdd3f641d2829cbc1efc993ef4109b Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Mon, 25 Jun 2012 20:56:52 -0500 Subject: Fix kate and kwrite versions to better match new R14 version scheme. --- kate/app/kateapp.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'kate/app/kateapp.cpp') diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index c6515dc12..f57bd2254 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -131,8 +131,12 @@ Kate::Application *KateApp::application () */ TQString KateApp::kateVersion (bool fullVersion) { - return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()) - : TQString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()); +// return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()) +// : TQString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()); + /** The previous version computation scheme (commented out above) worked fine in the 3.5.x days. + With the new Trinity Rx.y.z scheme the version number gets weird. + We now hard-code the first two numbers to match the 3.5.x days and only update the last number. */ + return fullVersion ? TQString ("2.5.%1").arg(KDE::versionMajor()) : TQString ("%1.%2").arg(2.5); } void KateApp::restoreKate () -- cgit v1.2.1