diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-09-03 16:52:23 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-19 13:59:59 +0100 |
| commit | 8ed994f7acd0988a7399e89c2c8f58309754c1c1 (patch) | |
| tree | 6f4e62ae28ae9e2fcf1dc5e22542789508e25f9b /src | |
| parent | 19a920c4604b7edfb1632ac30281a1e498a838b0 (diff) | |
iOS: Make sure QStandardPaths::displayName() is defined
The file qstandardpaths_ios.mm doesn't have an implementation for
this function, only (the wrongly named) qstandardpaths_mac.cpp
does. There's no Foundation API to get the directory name, so
we fall back to the hard-coded strings like all other platforms.
Change-Id: I6dcfeb6a0e5860dd0d4e9a0cd334b2c2181a0004
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qstandardpaths.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index 2583e46ad8..c206e432f6 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -526,7 +526,7 @@ QString QStandardPaths::findExecutable(const QString &executableName, const QStr an empty QString if no relevant location can be found. */ -#if !defined(Q_OS_MAC) && !defined(QT_BOOTSTRAPPED) +#if !defined(Q_OS_OSX) && !defined(QT_BOOTSTRAPPED) QString QStandardPaths::displayName(StandardLocation type) { switch (type) { |