hatam
/
QtMvvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

try mingw fix

pull/2/head
Skycoder42 7 years ago
parent
55dda691f5
commit
0c003b74bb
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
1 changed files with 11 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      tests/auto/testrun.pri

21
tests/auto/testrun.pri
View File

@ -7,9 +7,10 @@ win32 {
} else { } else {
runtarget.target = run-tests runtarget.target = run-tests
runtarget.depends += $(DESTDIR_TARGET) 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 "QT_PLUGIN_PATH=$$shadowed($$dirname(_QMAKE_CONF_))/plugins;$(QT_PLUGIN_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 "QML2_IMPORT_PATH=$$shadowed($$dirname(_QMAKE_CONF_))/qml;$(QML2_IMPORT_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)@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)start /w call $(DESTDIR_TARGET) ^> $(DESTDIR)test.log ^|^| echo FAIL ^> fail ^& exit 0
runtarget.commands += $$escape_expand(\\n\\t)type $(DESTDIR)test.log runtarget.commands += $$escape_expand(\\n\\t)type $(DESTDIR)test.log
@ -19,28 +20,28 @@ win32 {
} else { } else {
linux { linux {
runtarget_env_lib.target = run-tests runtarget_env_lib.target = run-tests
runtarget_env_lib.depends = export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)" runtarget_env_lib.depends = export LD_LIBRARY_PATH := \"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)\"
runtarget_env_qpa.target = run-tests runtarget_env_qpa.target = run-tests
runtarget_env_qpa.depends += export QT_QPA_PLATFORM := "minimal" runtarget_env_qpa.depends += export QT_QPA_PLATFORM := \"minimal\"
QMAKE_EXTRA_TARGETS += \ QMAKE_EXTRA_TARGETS += \
runtarget_env_lib \ runtarget_env_lib \
runtarget_env_qpa runtarget_env_qpa
} else:mac { } else:mac {
runtarget_env_lib.target = run-tests runtarget_env_lib.target = run-tests
runtarget_env_lib.depends = export DYLD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)" runtarget_env_lib.depends = export DYLD_LIBRARY_PATH := \"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)\"
runtarget_env_framework.target = run-tests runtarget_env_framework.target = run-tests
runtarget_env_framework.depends = export DYLD_FRAMEWORK_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)" runtarget_env_framework.depends = export DYLD_FRAMEWORK_PATH := \"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)\"
QMAKE_EXTRA_TARGETS += \ QMAKE_EXTRA_TARGETS += \
runtarget_env_lib \ runtarget_env_lib \
runtarget_env_framework runtarget_env_framework
} }
runtarget_env_bin.target = run-tests runtarget_env_bin.target = run-tests
runtarget_env_bin.depends = export PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)" runtarget_env_bin.depends = export PATH := \"$$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)\"
runtarget_env_plugins.target = run-tests runtarget_env_plugins.target = run-tests
runtarget_env_plugins.depends = export QT_PLUGIN_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/plugins/:$(QT_PLUGIN_PATH)" runtarget_env_plugins.depends = export QT_PLUGIN_PATH := \"$$shadowed($$dirname(_QMAKE_CONF_))/plugins/:$(QT_PLUGIN_PATH)\"
runtarget_env_qml.target = run-tests runtarget_env_qml.target = run-tests
runtarget_env_qml.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$(QML2_IMPORT_PATH)" runtarget_env_qml.depends += export QML2_IMPORT_PATH := \"$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$(QML2_IMPORT_PATH)\"
QMAKE_EXTRA_TARGETS += \ QMAKE_EXTRA_TARGETS += \
runtarget_env_bin \ runtarget_env_bin \
runtarget_env_plugins \ runtarget_env_plugins \

Write Preview
Loading…
Cancel
Save