From 78f36210d4d1cce5da950a5d9ca73bb6e30db10e Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Fri, 3 Aug 2018 12:52:04 +0200 Subject: [PATCH] Partially revert "try mingw fix" This partially reverts commit 0c003b74bb25b0409f548a81d0628e0bbf39fdca. --- tests/auto/testrun.pri | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/auto/testrun.pri b/tests/auto/testrun.pri index 9d4421e..48e9b78 100644 --- a/tests/auto/testrun.pri +++ b/tests/auto/testrun.pri @@ -7,10 +7,9 @@ win32 { } else { runtarget.target = run-tests runtarget.depends += $(DESTDIR_TARGET) - win32-g++: runtarget.commands += @setlocal - 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 += @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 runtarget.commands += $$escape_expand(\\n\\t)start /w call $(DESTDIR_TARGET) ^> $(DESTDIR)test.log ^|^| echo FAIL ^> fail ^& exit 0 runtarget.commands += $$escape_expand(\\n\\t)type $(DESTDIR)test.log