[rkward] /: Bookkeeping and backwards compatibility

[Thomas Friedrichsmeier]

Git commit 30217cc96fbe256cba70d2cbba0da61133a56d85 by Thomas Friedrichsmeier.
Committed on 20/04/2018 at 08:44.
Pushed by tfry into branch 'master'.

Bookkeeping and backwards compatibility

M  +1    -0    ChangeLog
M  +6    -1    rkward/windows/rktoolwindowbar.cpp

https://commits.kde.org/rkward/30217cc96fbe256cba70d2cbba0da61133a56d85

diff --git a/ChangeLog b/ChangeLog
index aca0a160..3e52ec77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 --- Version 0.7.1 - UNRELEASED
+- On Mac, do not attempt to start DBus, if it is already running
 - Fix most compiler warnings
 - File tool window gains button to switch to current working directory
 - Fix a crash when closing a plugin dialog with an active plot preview
diff --git a/rkward/windows/rktoolwindowbar.cpp b/rkward/windows/rktoolwindowbar.cpp
index dfbd3b57..a8f5cbdb 100644
--- a/rkward/windows/rktoolwindowbar.cpp
+++ b/rkward/windows/rktoolwindowbar.cpp
@@ -2,7 +2,7 @@
                           rktoolwindowbar  -  description
                              -------------------
     begin                : Fri Oct 12 2007
-    copyright            : (C) 2007, 2011 by Thomas Friedrichsmeier
+    copyright            : (C) 2007-2018 by Thomas Friedrichsmeier
     email                : thomas.friedrichsmeier at kdemail.net
  ***************************************************************************/
 
@@ -23,6 +23,7 @@
 #include <KLocalizedString>
 #include <kparts/partmanager.h>
 #include <kselectaction.h>
+#include <kwidgetsaddons_version.h>
 
 #include <QSplitter>
 #include <QContextMenuEvent>
@@ -136,7 +137,11 @@ void RKToolWindowBar::addWidget (RKMDIWindow *window) {
 		window->tool_window_bar->removeWidget (window);
 	}
 
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5,13,0)
 	appendTab (window->windowIcon (), id, window->shortCaption ());
+#else
+	appendTab (window->windowIcon ().pixmap (QSize (16, 16)), id, window->shortCaption ());
+#endif
 
 	window->tool_window_bar = this;
 	widget_to_id.insert (window, id);