diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-02-25 13:42:15 +0100 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-02-26 22:27:23 +0100 |
| commit | 84306931190ce2c846a826b4c2bbefc8987b4405 (patch) | |
| tree | 20b34c020887d0c957974566e6da72a55dc55b16 | |
| parent | 481930be315663b2f3db2de3d22c45f803af9e8f (diff) | |
Fix path issues in QDoc's generatedOutput autotest
Since the refactoring, even though the tests pass, QDoc was generating
more warnings under the hood as include paths are invalid in multiple
cases.
Change-Id: Id5bdb894c925c35ce871b2170dbd5e1f0ddc2d74
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
6 files changed, 8 insertions, 10 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h index 686cbe948..06f046a71 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h +++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h @@ -1,3 +1,3 @@ -#include "testmodule/aaa.h" -#include "testmodule/bbb.h" -#include "testmodule/ccc.h" +#include "aaa.h" +#include "bbb.h" +#include "ccc.h" diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf index c02fb6fcf..23a4b27f6 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf @@ -2,9 +2,9 @@ project = TestModule moduleheader = TestModule.h -headerdirs = inc -sourcedirs = src -includepaths += ./bug80259/inc/testmodule +headerdirs = ./inc +sourcedirs = ./src +includepaths += ./inc/testmodule sources.fileextensions = "*.cpp *.qdoc" headers.fileextensions = "*.h" diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf index 53f6071f9..80ac58475 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf @@ -1,5 +1,5 @@ project = TestCPP -includepaths += -I. +includepaths += -I../testcpp headers = ../testcpp/testcpp.h sources = ../testcpp/testcpp.cpp diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule index df9c82ad5..50bea93ab 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule +++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule @@ -1,2 +1,2 @@ -#include "../TestCPP" +#include "../testcpp/TestCPP" #include "testtype.h" diff --git a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf index 9c60c758f..1d981deb2 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf @@ -1,6 +1,5 @@ include(../configs/testqml.qdocconf) -includepaths += .. sourcedirs += src excludedirs += excludes \ diff --git a/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf index c535b4032..62952b429 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf @@ -1,6 +1,5 @@ include(../configs/testqml.qdocconf) -includepaths += .. sourcedirs += . HTML.nosubdirs = true |