diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:47 +0100 |
| commit | 3ec31ef9c5acd57a4a59c0d5f5e20b8d9a19bfa1 (patch) | |
| tree | 8b55dd13dbc2a33fe7c857f622e10b817386bdb3 /src/corelib/io | |
| parent | 6f87f2d23fb50d8183ea173fe423b7e1a24c0e2e (diff) | |
| parent | 4ad8798de428b44fe4c56e1ca111940068056c57 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2532c7f7db5e6cc3ef09753d886279816dd662b2
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qstandardpaths_winrt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths_winrt.cpp b/src/corelib/io/qstandardpaths_winrt.cpp index b1e51c5082..cb4d1dd152 100644 --- a/src/corelib/io/qstandardpaths_winrt.cpp +++ b/src/corelib/io/qstandardpaths_winrt.cpp @@ -123,7 +123,8 @@ QString QStandardPaths::writableLocation(StandardLocation type) QStringList QStandardPaths::standardLocations(StandardLocation type) { - return QStringList(writableLocation(type)); + const QString writable = writableLocation(type); + return writable.isEmpty() ? QStringList() : QStringList(writable); } QT_END_NAMESPACE |