Browse Source

Partially revert "try mingw fix"

This partially reverts commit 0c003b74bb.
pull/2/head
Skycoder42 7 years ago
parent
commit
78f36210d4
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
  1. 7
      tests/auto/testrun.pri

7
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

Loading…
Cancel
Save