diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 01:00:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 01:00:08 +0200 |
| commit | ce7f14d2e0791acc92622fdc23886a06d6712e90 (patch) | |
| tree | 5f2b0f0a6c4a37dfaa1f31abf7e58d8a3cec1e3c /src/corelib/io | |
| parent | 0998a9d1d53361e572d7377af8cb41a49bbfad72 (diff) | |
| parent | f4c41b9797f08f173049502fa7bd465cf5bde938 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iec860bb703f983b7438e67c695b9c454e72b3e0f
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qstandardpaths_win.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp index 1809861fc6..c2c3b2702b 100644 --- a/src/corelib/io/qstandardpaths_win.cpp +++ b/src/corelib/io/qstandardpaths_win.cpp @@ -86,15 +86,6 @@ static void appendOrganizationAndApp(QString &path) // Courtesy qstandardpaths_u #endif } -static inline QString displayName(QStandardPaths::StandardLocation type) -{ -#ifndef QT_BOOTSTRAPPED - return QStandardPaths::displayName(type); -#else - return QString::number(type); -#endif -} - static inline void appendTestMode(QString &path) { if (QStandardPaths::isTestModeEnabled()) |