diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-25 03:00:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-25 03:00:47 +0100 |
| commit | 94c0fd2b718332f9307b6de4e3863540612aed54 (patch) | |
| tree | b40790b12a25cd60ce276836d2cbadbf6b3f6f71 /tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf | |
| parent | 402ebd2dbb121dc2dfe8866b663c9c7c6e80200c (diff) | |
| parent | d8a971b8475035f61e1ad3baaef6a8c49556c42d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iabcee67b9cf246cd5f1fe97205ed41b4763210ec
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf new file mode 100644 index 000000000..dc9234fbb --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf @@ -0,0 +1,2 @@ +include(testmodule.qdocconf) +include(../configs/webxml.qdocconf) |