update testrun script

Author: Skycoder42

tests/auto/testrun.pri

@@ -22,17 +22,17 @@ win32:!ReleaseBuild:!DebugBuild {
 		QMAKE_EXTRA_TARGETS += runtarget
 	} else {
 		win32-g++: QMAKE_DIRLIST_SEP = ";"
-		runtarget.commands += export PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)\"
-		runtarget.commands += $$escape_expand(\\n\\t)export QT_PLUGIN_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/plugins/$${QMAKE_DIRLIST_SEP}$(QT_PLUGIN_PATH)\"
-		runtarget.commands += $$escape_expand(\\n\\t)export QML2_IMPORT_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/qml/$${QMAKE_DIRLIST_SEP}$(QML2_IMPORT_PATH)\"
+		runtarget.commands += @export PATH=\"$$shell_path($$shadowed($$dirname(_QMAKE_CONF_))/bin/):$$shell_path($$[QT_INSTALL_BINS]):$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}PATH\"
+		runtarget.commands += $$escape_expand(\\n\\t)@export QT_PLUGIN_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/plugins/$${QMAKE_DIRLIST_SEP}$(QT_PLUGIN_PATH)\"
+		runtarget.commands += $$escape_expand(\\n\\t)@export QML2_IMPORT_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/qml/$${QMAKE_DIRLIST_SEP}$(QML2_IMPORT_PATH)\"
 		win32-g++: QMAKE_DIRLIST_SEP = ":"
 
 		linux|win32-g++ {
-			runtarget.commands += $$escape_expand(\\n\\t)export LD_LIBRARY_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)\"
-			runtarget.commands += $$escape_expand(\\n\\t)export QT_QPA_PLATFORM=minimal
+			runtarget.commands += $$escape_expand(\\n\\t)@export LD_LIBRARY_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/$${QMAKE_DIRLIST_SEP}$$[QT_INSTALL_LIBS]$${QMAKE_DIRLIST_SEP}$(LD_LIBRARY_PATH)\"
+			runtarget.commands += $$escape_expand(\\n\\t)@export QT_QPA_PLATFORM=minimal
 		} else:mac {
-			runtarget.commands += $$escape_expand(\\n\\t)export DYLD_LIBRARY_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)\"
-			runtarget.commands += $$escape_expand(\\n\\t)export DYLD_FRAMEWORK_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)\"
+			runtarget.commands += $$escape_expand(\\n\\t)@export DYLD_LIBRARY_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)\"
+			runtarget.commands += $$escape_expand(\\n\\t)@export DYLD_FRAMEWORK_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)\"
 		}
 
 		runtarget.target = run-tests