diff --git a/tests/auto/testrun.pri b/tests/auto/testrun.pri index bf29899..471d2e3 100644 --- a/tests/auto/testrun.pri +++ b/tests/auto/testrun.pri @@ -7,7 +7,10 @@ win32 { } else { runtarget.target = run-tests runtarget.depends += $(DESTDIR_TARGET) - runtarget.commands += @set PATH=$$shell_path($$shadowed($$dirname(_QMAKE_CONF_))/bin);$$shell_path($$[QT_INSTALL_BINS]);$(PATH) + win32-g++ { + runtarget.commands += @setlocal + runtarget.commands += $$escape_expand(\\n\\t)@set PATH=$$shell_path($$shadowed($$dirname(_QMAKE_CONF_))/bin);$$shell_path($$[QT_INSTALL_BINS]);$(PATH) + } else: runtarget.commands += @set PATH=$$shell_path($$shadowed($$dirname(_QMAKE_CONF_))/bin);$$shell_path($$[QT_INSTALL_BINS]);$(PATH) runtarget.commands += $$escape_expand(\\n\\t)@set QT_PLUGIN_PATH=$$shadowed($$dirname(_QMAKE_CONF_))/plugins;$(QT_PLUGIN_PATH) runtarget.commands += $$escape_expand(\\n\\t)@set QML2_IMPORT_PATH=$$shadowed($$dirname(_QMAKE_CONF_))/qml;$(QML2_IMPORT_PATH) runtarget.commands += $$escape_expand(\\n\\t)@set QT_QPA_PLATFORM=minimal