diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
commit | 084c5b3db794af1ce86b2b17455d9be5e64baebe (patch) | |
tree | 46d29a7b89ff251c07b6fdd59c57e30f14baa64a /src/network/ssl/qsslsocket_openssl_symbols.cpp | |
parent | f4a0d6d2494d1dd41cd5b854a48b435120714d32 (diff) | |
parent | 54987c6bf55b159d3ddb79461439700f6e0111f9 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_symbols.cpp')
-rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 8ad2395a7f..ec4730a022 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 <QtCore/qdir.h> #endif -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) #include <link.h> #endif @@ -389,7 +389,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)) @@ -420,7 +420,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 |