1 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp
index a64bde6fb4..41fd31df8b 100644
--- a/src/corelib/io/qstandardpaths_win.cpp
+++ b/src/corelib/io/qstandardpaths_win.cpp
@@ -218,7 +218,15 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
         }
 #ifndef QT_BOOTSTRAPPED
         dirs.append(QCoreApplication::applicationDirPath());
-        dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
+        const QString dataDir = QCoreApplication::applicationDirPath() + QLatin1String("/data");
+        dirs.append(dataDir);
+
+        if (!isGenericConfigLocation(type)) {
+            QString appDataDir = dataDir;
+            appendOrganizationAndApp(appDataDir);
+            if (appDataDir != dataDir)
+                dirs.append(appDataDir);
+        }
 #endif // !QT_BOOTSTRAPPED
     } // isConfigLocation()