iOS: Make sure QStandardPaths::displayName() is defined
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Wed, 3 Sep 2014 14:52:23 +0000 (16:52 +0200)
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>
Wed, 19 Nov 2014 12:59:59 +0000 (13:59 +0100)
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>
src/corelib/io/qstandardpaths.cpp

index 2583e46ad85aae49b14dcc82d9039d29d4dadbae..c206e432f6056c744dffff2a7c9b374a9a70bcd9 100644 (file)
@@ -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) {