[rkward/frameworks] rkward: Merge branch 'work/frameworks-Mac' into frameworks

[Thomas Friedrichsmeier]

Git commit 5647ba024544a2f62afbfbb50c33bd7ec3e9b7cc by Thomas Friedrichsmeier.
Committed on 21/06/2017 at 18:55.
Pushed by tfry into branch 'frameworks'.

Merge branch 'work/frameworks-Mac' into frameworks

M  +1    -1    rkward/agents/rksaveagent.cpp
M  +1    -1    rkward/core/robject.cpp
M  +1    -1    rkward/dialogs/rkerrordialog.cpp
M  +5    -4    rkward/main.cpp
M  +3    -3    rkward/rbackend/rkfrontendtransmitter.cpp
M  +2    -2    rkward/rbackend/rksessionvars.cpp
M  +2    -2    rkward/rkward.cpp
M  +1    -1    rkward/windows/rkhtmlwindow.cpp
M  +1    -1    rkward/windows/rkworkplace.cpp

https://commits.kde.org/rkward/5647ba024544a2f62afbfbb50c33bd7ec3e9b7cc

diff --cc rkward/dialogs/rkerrordialog.cpp
index 48088bf8,1cdbb237..c1518115
--- a/rkward/dialogs/rkerrordialog.cpp
+++ b/rkward/dialogs/rkerrordialog.cpp
@@@ -29,9 -30,8 +29,9 @@@
  #include <QPushButton>
  #include <QDialog>
  #include <QVBoxLayout>
 +#include <QDesktopServices>
  
- #include "../rbackend/rinterface.h"
+ #include "../rbackend/rkrinterface.h"
  #include "../rbackend/rksessionvars.h"
  #include "../misc/rkprogresscontrol.h"
  #include "../misc/rkdialogbuttonbox.h"