diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-06 13:51:37 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-10 14:09:45 +0200 |
| commit | 0c0c04b4053d0298dff881a15ae64e6ff6d29f93 (patch) | |
| tree | 16c10e25a1f223db3335bff09daddf30c4754620 /tests/auto/tools/qmake/testdata | |
| parent | e78e7d325b85a96851615ae0199d3465b5d394c3 (diff) | |
Fix semantics of the src dir in the include search paths with MinGW
This issue originates from https://bugs.webkit.org/show_bug.cgi?id=95736
Suppose we have
main.cpp
somedirectory/someheader.h -- which has #include "anotherheader.h"
anotherheader.h
With unix generator, the directory where main.cpp is located is included,
unless no_include_pwd is set. Hence the look-up of anotherheader.h from
within someheader.h will work.
With MSVC this works because MSVC looks "in the directories of any
previously opened include files in the reverse order in which they were
opened." (from http://msdn.microsoft.com/en-us/library/36k2cdd4.aspx)
Unfortunately the build breaks with MinGW, because it lacks support for
including the source directory in the include search path just like the
unix generator does.
This patch adds the same functionality to the MinGW generator as well as
an auto-test.
Change-Id: Iea8bb06e34862c51b8fd4eca2ee26668e24a319a
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tests/auto/tools/qmake/testdata')
4 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/tools/qmake/testdata/include_pwd/anotherheader.h b/tests/auto/tools/qmake/testdata/include_pwd/anotherheader.h new file mode 100644 index 0000000000..a3a63e26bf --- /dev/null +++ b/tests/auto/tools/qmake/testdata/include_pwd/anotherheader.h @@ -0,0 +1,2 @@ + +/* This file should be included indirectly through main.cpp */ diff --git a/tests/auto/tools/qmake/testdata/include_pwd/include_pwd.pro b/tests/auto/tools/qmake/testdata/include_pwd/include_pwd.pro new file mode 100644 index 0000000000..c00815f5b4 --- /dev/null +++ b/tests/auto/tools/qmake/testdata/include_pwd/include_pwd.pro @@ -0,0 +1,4 @@ +TEMPLATE = app +SOURCES = main.cpp +CONFIG -= debug_and_release_target +INCLUDEPATH += somedirectory diff --git a/tests/auto/tools/qmake/testdata/include_pwd/main.cpp b/tests/auto/tools/qmake/testdata/include_pwd/main.cpp new file mode 100644 index 0000000000..c98935f87d --- /dev/null +++ b/tests/auto/tools/qmake/testdata/include_pwd/main.cpp @@ -0,0 +1,6 @@ +#include "someheader.h" + +int main() +{ + return 0; +} diff --git a/tests/auto/tools/qmake/testdata/include_pwd/somedirectory/someheader.h b/tests/auto/tools/qmake/testdata/include_pwd/somedirectory/someheader.h new file mode 100644 index 0000000000..f977346945 --- /dev/null +++ b/tests/auto/tools/qmake/testdata/include_pwd/somedirectory/someheader.h @@ -0,0 +1 @@ +#include "anotherheader.h" |