Merge with develop.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-06-26 11:34:04 +03:00
commit 05d2873de7

View File

@ -91,7 +91,7 @@ defineTest(copyToDestdir) {
FILE ~= s,/,\\,g FILE ~= s,/,\\,g
DDIR ~= s,/,\\,g DDIR ~= s,/,\\,g
} }
QMAKE_PRE_LINK += $$VCOPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$VCOPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
} }
QMAKE_CLEAN += $$DDIR/$$basename(FILE) QMAKE_CLEAN += $$DDIR/$$basename(FILE)
@ -117,7 +117,7 @@ defineTest(forceCopyToDestdir) {
FILE ~= s,/,\\,g FILE ~= s,/,\\,g
DDIR ~= s,/,\\,g DDIR ~= s,/,\\,g
} }
QMAKE_PRE_LINK += $$VCOPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$VCOPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
QMAKE_CLEAN += $$DDIR/$$basename(FILE) QMAKE_CLEAN += $$DDIR/$$basename(FILE)
} }
} }