summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorArvid Picciani <aep@exys.org>2012-09-09 21:36:55 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-10 11:25:01 +0200
commit9094aa187f19c21ab974d9fa9a2a91ee620fa529 (patch)
treed0d5be285f314aa922f7496b3478aafb5d1114c3 /src/corelib
parent8a4530c954a216ccb3797f4e331ec475d3cf9432 (diff)
android: we have mkdtemp.
they just forgot to declare it. see: bionic ad1ff2fb268034074488f0b4b30b5311008b8617 Change-Id: Ide0c0edaa1b5fd17e58ffce1e3d49e320d80e57a Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Arvid Picciani <aep@exys.org>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qtemporarydir.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/io/qtemporarydir.cpp b/src/corelib/io/qtemporarydir.cpp
index fde1944f8f..6ee8762341 100644
--- a/src/corelib/io/qtemporarydir.cpp
+++ b/src/corelib/io/qtemporarydir.cpp
@@ -52,7 +52,7 @@
#endif
#include <stdlib.h> // mkdtemp
-#if defined(Q_OS_QNX) || defined(Q_OS_WIN) || defined(Q_OS_LINUX_ANDROID)
+#if defined(Q_OS_QNX) || defined(Q_OS_WIN)
#include <private/qfilesystemengine_p.h>
#endif
@@ -94,7 +94,7 @@ static QString defaultTemplateName()
return QDir::tempPath() + QLatin1Char('/') + baseName + QLatin1String("-XXXXXX");
}
-#if defined(Q_OS_QNX ) || defined(Q_OS_WIN) || defined(Q_OS_LINUX_ANDROID)
+#if defined(Q_OS_QNX ) || defined(Q_OS_WIN)
static char *mkdtemp(char *templateName)
{
static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@@ -138,6 +138,8 @@ static char *mkdtemp(char *templateName)
}
return 0;
}
+#elif defined(Q_OS_LINUX_ANDROID)
+extern char *mkdtemp(char *);
#endif
void QTemporaryDirPrivate::create(const QString &templateName)