diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-02-07 17:20:33 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-02-07 17:20:33 (GMT) |
| commit | 59a9938f91070ad3699fc6544848f0955ecf0bdd (patch) | |
| tree | 99ad7312ddddf7233290115c7ea5daa3af0b83ec /tests/benchmarks/trusted-benchmarks.pri | |
| parent | b9307547c717606e08661cf474eeaf81cc0789e6 (diff) | |
| parent | 44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff) | |
| download | Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.zip Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.gz Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.bz2 | |
Merge remote branch 'qt/master' into symbian-socket-engine
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworksession.cpp
src/network/kernel/qnetworkproxy_symbian.cpp
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/platformsocketengine/tst_platformsocketengine.cpp
Diffstat (limited to 'tests/benchmarks/trusted-benchmarks.pri')
| -rw-r--r-- | tests/benchmarks/trusted-benchmarks.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/benchmarks/trusted-benchmarks.pri b/tests/benchmarks/trusted-benchmarks.pri index 632dcff..a835cbd 100644 --- a/tests/benchmarks/trusted-benchmarks.pri +++ b/tests/benchmarks/trusted-benchmarks.pri @@ -1,8 +1,11 @@ # Edit the list of trusted benchmarks in each of the sub-targets +# command terminating newline in Makefile +NL=$$escape_expand(\\n\\t) + check-trusted.depends = qmake for(benchmark, TRUSTED_BENCHMARKS) { - check-trusted.commands += (cd $$benchmark && $(MAKE) -f $(MAKEFILE) check); + check-trusted.commands += -cd $$benchmark && $(MAKE) -f $(MAKEFILE) check$${NL} } QMAKE_EXTRA_TARGETS += check-trusted |