[rkward/frameworks] /: Add KF5 runtime version info to rk.sessionInfo() (if available)

[Thomas Friedrichsmeier]

Git commit 32bdd7bc3e54c2cfdde0d2388508c888e33afe36 by Thomas Friedrichsmeier.
Committed on 06/06/2017 at 19:35.
Pushed by tfry into branch 'frameworks'.

Add KF5 runtime version info to rk.sessionInfo() (if available)

Also some bookkeeping.

M  +2    -3    ChangeLog
M  +5    -3    rkward/rbackend/rksessionvars.cpp

https://commits.kde.org/rkward/32bdd7bc3e54c2cfdde0d2388508c888e33afe36

diff --git a/ChangeLog b/ChangeLog
index 63628d37..04c36fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
+TODO: Location of syntax highlighting definitions has changed in KF 5.28.0 does this affect us (R console highlighting)?
+
 - Fixed: Creating trellis on-screen plots, while package lattice is not on the search path would produce errors in plot history mechanism
 - Limit the number of debug log-files to keep (at most three, each, for frontend and backend)
 - Remove Windows-only UI for setInternet2()-option (no longer available in R, with setInternet2(TRUE) the default since R 3.2.2)
 - Remove startup wrapper script (moving the still-needed functionality into the main executable)
-    TODO: This is still mostly EXPERIMENTAL, and only vaguely tested on Linux so far. It should help resolve a number of long standing quirks, though, such as command windows (on Windows), icons,
-          startup notification quirks, etc.
-    TODO: Clean up the Mac portions in CMakeLists.txt
 - Function argument hinting is less easily fooled by braces inside quotes
 - Preview status messages can now be closed
 - Show the message accompanying rk.show.files() or rk.edit.files() inside the main window, instead of a separate dialog
diff --git a/rkward/rbackend/rksessionvars.cpp b/rkward/rbackend/rksessionvars.cpp
index 2aab714a..6c776e21 100644
--- a/rkward/rbackend/rksessionvars.cpp
+++ b/rkward/rbackend/rksessionvars.cpp
@@ -22,7 +22,7 @@
 #include "../settings/rksettingsmodulegeneral.h"
 #include "../version.h"
 
-#include <kxmlgui_version.h>
+#include <kcoreaddons_version.h>
 
 #include <QTemporaryFile>
 #include <QStandardPaths>
@@ -122,8 +122,10 @@ QStringList RKSessionVars::frontendSessionInfo () {
 	QStringList lines;
 	lines.append ("RKWard version: " RKWARD_VERSION);
 	// KF5 TODO: find replacement for line below
-	//lines.append ("KDE version (runtime): " + QString (KDE::versionString ()));
-	lines.append ("KDE version (compile time): " KXMLGUI_VERSION_STRING);
+#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5,20,0)
+	lines.append ("KDE version (runtime): " + QString (KCoreAddons::versionString ()));
+#endif
+	lines.append ("KDE version (compile time): " KCOREADDONS_VERSION_STRING);
 	lines.append (QString ("Qt version (runtime): ") + qVersion ());
 #if defined Q_OS_WIN
 	lines.append ("Windows runtime version (refer to QSysInfo documentation to translate code into human readable form): 0x" + QString::number (QSysInfo::windowsVersion (), 16));