summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qdoc/config.cpp4
-rw-r--r--tests/auto/qdoc/config/testdata/exampletest/examples/test/example4/example4.pro1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index a65694abd..88a19b648 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -805,10 +805,10 @@ QString Config::getExampleProjectFile(const QString &examplePath)
{
QFileInfo fileInfo(examplePath);
QStringList validNames;
- validNames << fileInfo.fileName() + QLatin1String(".pro")
+ validNames << QLatin1String("CMakeLists.txt")
+ << fileInfo.fileName() + QLatin1String(".pro")
<< fileInfo.fileName() + QLatin1String(".qmlproject")
<< fileInfo.fileName() + QLatin1String(".pyproject")
- << QLatin1String("CMakeLists.txt")
<< QLatin1String("qbuild.pro"); // legacy
QString projectFile;
diff --git a/tests/auto/qdoc/config/testdata/exampletest/examples/test/example4/example4.pro b/tests/auto/qdoc/config/testdata/exampletest/examples/test/example4/example4.pro
new file mode 100644
index 000000000..556df42ea
--- /dev/null
+++ b/tests/auto/qdoc/config/testdata/exampletest/examples/test/example4/example4.pro
@@ -0,0 +1 @@
+# nothing