diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-06 01:01:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-06 01:01:08 +0200 |
| commit | 2c4b44d7500be72b6eb74c4989e7311b3f924119 (patch) | |
| tree | 8cf8cb8aa36f18ee9474486178f51c7fe0770ee8 /tests/auto/tools/qmake/testdata | |
| parent | 7e2016de5ee6d9cc2c5d6b94fab4bc56a8a33303 (diff) | |
| parent | 327b305e95187fda869c5af407e78a17e0e381cd (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ife31dad3c8dc43c5ff4d266e6d646230c5d20a50
Diffstat (limited to 'tests/auto/tools/qmake/testdata')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/conflicting_targets/conflicting_targets.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/tools/qmake/testdata/conflicting_targets/conflicting_targets.pro b/tests/auto/tools/qmake/testdata/conflicting_targets/conflicting_targets.pro index c3e8034e35..bd0d4d824a 100644 --- a/tests/auto/tools/qmake/testdata/conflicting_targets/conflicting_targets.pro +++ b/tests/auto/tools/qmake/testdata/conflicting_targets/conflicting_targets.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += debug_and_release +CONFIG += debug_and_release build_all TARGET = bah DESTDIR = shu SOURCES += main.cpp |