diff options
| -rw-r--r-- | src/qdoc/config.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp index 0f5acb406..695d59444 100644 --- a/src/qdoc/config.cpp +++ b/src/qdoc/config.cpp @@ -993,9 +993,10 @@ QStringList Config::loadMaster(const QString &fileName) stream.setCodec("UTF-8"); #endif QStringList qdocFiles; + QDir configDir(QFileInfo(fileName).canonicalPath()); QString line = stream.readLine(); while (!line.isNull()) { - qdocFiles.append(line); + qdocFiles.append(QFileInfo(configDir, line).filePath()); line = stream.readLine(); } fin.close(); diff --git a/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf index eee0253d0..037cfc74a 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf @@ -1,2 +1,2 @@ -./testdata/configs/testcpp_singleexec.qdocconf -./testdata/crossmodule/crossmodule_singleexec.qdocconf +../configs/testcpp_singleexec.qdocconf +../crossmodule/crossmodule_singleexec.qdocconf |