1 files changed, 8 insertions, 2 deletions
diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp
index a475ccbfb6..c63dba7a01 100644
--- a/src/tools/qdoc/config.cpp
+++ b/src/tools/qdoc/config.cpp
@@ -279,10 +279,16 @@ int Config::getInt(const QString& var) const
   */
 QString Config::getOutputDir() const
 {
+    QString t;
     if (overrideOutputDir.isNull())
-        return getString(QLatin1String(CONFIG_OUTPUTDIR));
+        t = getString(QLatin1String(CONFIG_OUTPUTDIR));
     else
-        return overrideOutputDir;
+        t = overrideOutputDir;
+    if (!Generator::useOutputSubdirs()) {
+        t = t.left(t.lastIndexOf('/'));
+        t += QLatin1Char('/') + getString("HTML.outputsubdir");
+    }
+    return t;
 }
 
 /*!