diff options
| author | Eike Ziller <[email protected]> | 2013-03-08 11:39:33 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-03-08 11:39:33 +0100 |
| commit | f60873a24fbdb70c5da60ecc125a7f70ef130563 (patch) | |
| tree | c43ad3938b919ed84637f8b27a8447ac54d284f2 /src/plugins/debugger/debugger.pro | |
| parent | 934bccbc7e4f0f977f036c5fda9cd44b257cadaa (diff) | |
| parent | ce49ca841bdc5786860f78d3619c0a740d41a488 (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
Diffstat (limited to 'src/plugins/debugger/debugger.pro')
| -rw-r--r-- | src/plugins/debugger/debugger.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index 41531388a5b..fe929c11a1e 100644 --- a/src/plugins/debugger/debugger.pro +++ b/src/plugins/debugger/debugger.pro @@ -158,13 +158,14 @@ equals(TEST, 1):!isEmpty(copydata) { INPUT_FILE = $$IDE_SOURCE_TREE/$$TEST_DIR/simple.pro macx: OUTPUT_DIR = $$IDE_DATA_PATH/$$TEST_DIR else: OUTPUT_DIR = $$IDE_BUILD_TREE/$$TEST_DIR + testfile.target = $$OUTPUT_DIR/$$basename(INPUT_FILE) + testfile.depends = $$INPUT_FILE win32 { INPUT_FILE ~= s,/,\\\\,g OUTPUT_DIR ~= s,/,\\\\,g } else { isEmpty(QMAKE_CHK_EXISTS_GLUE):QMAKE_CHK_EXISTS_GLUE = "|| " } - testfile.target = test_resources testfile.commands = ($$QMAKE_CHK_DIR_EXISTS \"$$OUTPUT_DIR\" $$QMAKE_CHK_EXISTS_GLUE $$QMAKE_MKDIR \"$$OUTPUT_DIR\") \ && $$QMAKE_COPY \"$$INPUT_FILE\" \"$$OUTPUT_DIR\" QMAKE_EXTRA_TARGETS += testfile |