[rkward-cvs] SF.net SVN: rkward-code:[4658] trunk/rkward

[tfry at users.sf.net]

Revision: 4658
          http://sourceforge.net/p/rkward/code/4658
Author:   tfry
Date:     2013-04-02 16:24:07 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Merge 4649, 4650 from the 0.6.1 branch

Modified Paths:
--------------
    trunk/rkward/rkward/wrapper/rkward_startup_wrapper.cpp

Property Changed:
----------------
    trunk/rkward/

Index: trunk/rkward
===================================================================
--- trunk/rkward	2013-04-02 16:21:14 UTC (rev 4657)
+++ trunk/rkward	2013-04-02 16:24:07 UTC (rev 4658)

Property changes on: trunk/rkward
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/2010_10_18_backend_restructuring_branch:3130-3196
 /branches/release_branch_0.5.4:3098-3102,3127
 /branches/release_branch_0.5.7:3913,3979-3980,3998
+/branches/release_branches/rkward_0.6.1:4649-4650
\ No newline at end of property
Modified: trunk/rkward/rkward/wrapper/rkward_startup_wrapper.cpp
===================================================================
--- trunk/rkward/rkward/wrapper/rkward_startup_wrapper.cpp	2013-04-02 16:21:14 UTC (rev 4657)
+++ trunk/rkward/rkward/wrapper/rkward_startup_wrapper.cpp	2013-04-02 16:24:07 UTC (rev 4658)
@@ -73,6 +73,7 @@
 		kde_dir.makeAbsolute ();
 #ifdef Q_WS_WIN
 		kdeinit4_exe = findExeAtPath ("kdeinit4", kde_dir.path ());
+		qputenv ("PATH", QString (kde_dir.path () + ";" + qgetenv ("PATH")).toLocal8Bit ());
 #endif
 		// important if RKWard is not in KDEPREFIX/bin but e.g. KDEPREFIX/lib/libexec
 		qputenv ("RKWARD_ENSURE_PREFIX", kde_dir.path().toLocal8Bit ());
@@ -156,6 +157,7 @@
 		}
 	}
 
+	qputenv ("R_BINARY", r_exe.toLocal8Bit ());
 	QStringList call_args ("CMD");
 	if (!debugger_arg.isNull ()) call_args.append (debugger_arg);
 	call_args.append (rkward_frontend_exe);