diff options
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 |