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

[René J.V. Bertin]

Git commit 4093e7e200e72c453b49e569e37fdb1f4b8aa9fd by René J.V. Bertin.
Committed on 23/05/2017 at 10:27.
Pushed by rjvbb into branch 'work/frameworks-Mac'.

Merge branch 'frameworks' into work/frameworks-Mac

commit 2f056db597e558702ae25459e70deee71f41c881
    Rotate a limited number of debug log files, instead of creating an indefinite number.

M  +14   -22   rkward/main.cpp
M  +2    -2    rkward/rbackend/rkfrontendtransmitter.cpp
M  +7    -11   rkward/rbackend/rkrbackendprotocol_backend.cpp
M  +1    -1    rkward/rbackend/rksessionvars.cpp

https://commits.kde.org/rkward/4093e7e200e72c453b49e569e37fdb1f4b8aa9fd

diff --cc rkward/rbackend/rkrbackendprotocol_backend.cpp
index 8880e9d6,61d59ada..7f1b7486
--- a/rkward/rbackend/rkrbackendprotocol_backend.cpp
+++ b/rkward/rbackend/rkrbackendprotocol_backend.cpp
@@@ -35,15 -35,8 +35,12 @@@
  #include <QDir>
  #include <QUrl>
  
 +#ifdef Q_OS_MACOS
 +#include <CoreFoundation/CoreFoundation.h>
 +#endif
 +
  	void RK_setupGettext (const char*);
- 	int RK_Debug_Level = 2;
- 	int RK_Debug_Flags = DEBUG_ALL;
  	QMutex RK_Debug_Mutex;
- 	QTemporaryFile* RK_Debug_File;
  
  	void RKDebugMessageOutput (QtMsgType type, const QMessageLogContext &, const QString &msg) {
  		RK_Debug_Mutex.lock ();