From 61fbdc00fb03eba82309860487954d87460852a3 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 18 Jul 2013 14:42:14 +0200 Subject: Fix compilation of run-time-resolved SSL on Android We need the same code for both the no-sdk and the sdk case for the OpenSSL code, since this is not covered by a system library, but by an external dependency in both cases. Task-number: QTBUG-32130 Change-Id: I976835556fcb0e6c32cfb3da4dd585e45490061b Reviewed-by: Thiago Macieira --- src/network/ssl/qsslsocket_openssl_symbols.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network') diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 812703b21a..d2a349455e 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -67,7 +67,7 @@ #if defined(Q_OS_UNIX) #include #endif -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) #include #endif @@ -387,7 +387,7 @@ static bool libGreaterThan(const QString &lhs, const QString &rhs) return true; } -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) static int dlIterateCallback(struct dl_phdr_info *info, size_t size, void *data) { if (size < sizeof (info->dlpi_addr) + sizeof (info->dlpi_name)) @@ -418,7 +418,7 @@ static QStringList libraryPathList() paths << QLatin1String("/lib64") << QLatin1String("/usr/lib64") << QLatin1String("/usr/local/lib64"); paths << QLatin1String("/lib32") << QLatin1String("/usr/lib32") << QLatin1String("/usr/local/lib32"); -#if defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) paths << QLatin1String("/system/lib"); #elif defined(Q_OS_LINUX) // discover paths of already loaded libraries -- cgit v1.2.3