diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-06 17:39:52 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-07 09:46:24 (GMT) |
commit | b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61 (patch) | |
tree | 93c36e980ddac04e2aef8f0223f9aca84a205236 /tests/auto/qmake/testdata | |
parent | 047dd2d73fab867187d17f684be464233f64165b (diff) | |
download | Qt-b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61.zip Qt-b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61.tar.gz Qt-b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61.tar.bz2 |
run dep commands in build dir
the file names are given relative to the build directory, so the command
needs to be run in it as well. this is a more expected (and simpler) fix
than the alternative, which would be giving file names relative to the
source directory.
reasons not to fix:
- due to some other bug, the problem really affects only builds where
the build dir is not at the same level as the source dir - otherwise,
absolute paths would be passed anyway
- it has some breakage potential for the cases where the commands
actually expect being run in the source dir
- it can be worked around by manually injecting the cd statement into
the command
reasons why i still fixed it:
- it doesn't affect in-source builds, and it seems that most complex
build systems (which would define custom compilers with
depend_command) don't support shadow builds anyway
- people who needed things to work probably already used $$OUT_PWD somehow
(either a "cd" at the start, or prepending it to each path), so this
change will be practically a no-op
- "it's just dependencies, and these are known to be broken in qmake
anyway"
Reviewed-by: joerg
Task-number: QTBUG-1918
Diffstat (limited to 'tests/auto/qmake/testdata')
-rw-r--r-- | tests/auto/qmake/testdata/simple_app/build/README | 1 | ||||
-rw-r--r-- | tests/auto/qmake/testdata/simple_app/simple_app.pro | 1 | ||||
-rw-r--r-- | tests/auto/qmake/testdata/simple_app/test.qrc | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qmake/testdata/simple_app/build/README b/tests/auto/qmake/testdata/simple_app/build/README new file mode 100644 index 0000000..acfd9d9 --- /dev/null +++ b/tests/auto/qmake/testdata/simple_app/build/README @@ -0,0 +1 @@ +Here to ensure build/ exists, used by the simple_app_shadowbuild2 test. diff --git a/tests/auto/qmake/testdata/simple_app/simple_app.pro b/tests/auto/qmake/testdata/simple_app/simple_app.pro index f496d5b..a8c4ad6 100644 --- a/tests/auto/qmake/testdata/simple_app/simple_app.pro +++ b/tests/auto/qmake/testdata/simple_app/simple_app.pro @@ -3,6 +3,7 @@ CONFIG += qt warn_on HEADERS = test_file.h SOURCES = test_file.cpp \ main.cpp +RESOURCES = test.qrc TARGET = simple_app DESTDIR = ./ diff --git a/tests/auto/qmake/testdata/simple_app/test.qrc b/tests/auto/qmake/testdata/simple_app/test.qrc new file mode 100644 index 0000000..decde3d --- /dev/null +++ b/tests/auto/qmake/testdata/simple_app/test.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>test.qrc</file> + </qresource> +</RCC> |