diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-25 20:45:55 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-26 21:24:50 +0200 |
| commit | af61b5ca5cd92dbf21ee42e0a74f618b3b578ddd (patch) | |
| tree | a237ae218abff4bb852d0c18841d78c26176c38e /tests/auto/tools/qmake/testdata | |
| parent | b40f36603d93294d3117849acdd5ca6f012cd9f9 (diff) | |
CMake: Fix tst_qmake::resources() on Windows
This test calls qmake on a project that generates a .qrc file. On
Windows, where debug_and_release is on by default, the generated qrc
file ends up in a "debug" or "release" subdirectory. On other
platforms the file is generated directly in the build dir.
To guess the right location, the preprocessor defines RELEASE_BUILD
and DEBUG_BUILD were passed to tst_qmake.cpp by the test's .pro file.
While the mapping from debug_and_release was fine for the .pro file,
it was commented out in the automatically converted CMakeLists.txt.
Instead of trying to fix the condition, we're going the easier route
that's used in all other .pro files of tst_qmake: make sure that
debug_and_release doesn't get in the way. In other tests this is done
by setting
DESTDIR = ./
which doesn't work for the generated qrc file. That's why we simply do
CONFIG -= debug_and_release
to make sure that everything is generated directly in the build dir.
Change-Id: I557ac4e21d7b385004d369fae8a3f727d76d4d88
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/tools/qmake/testdata')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/resources/resources.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/tools/qmake/testdata/resources/resources.pro b/tests/auto/tools/qmake/testdata/resources/resources.pro index f024fe5617..8ced5048ae 100644 --- a/tests/auto/tools/qmake/testdata/resources/resources.pro +++ b/tests/auto/tools/qmake/testdata/resources/resources.pro @@ -1,4 +1,5 @@ TEMPLATE = app +CONFIG -= debug_and_release SOURCES = main.cpp pro_file.files = resources.pro |