From e6e61be80973e2fcf9a57c5b6472f913e5846991 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 9 Sep 2009 15:44:53 +0300 Subject: Added #ifdef Q_OS_SYMBIAN quard for ealier commit d78717e7 --- tests/auto/network-settings.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 3a5bed7..059d7b8 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -334,6 +334,7 @@ QByteArray QtNetworkSettings::imapExpectedReplySsl; class QtNetworkSettingsInitializerCode { public: QtNetworkSettingsInitializerCode() { +#ifdef Q_OS_SYMBIAN // We have a non-trivial constructor in global static. // The QtNetworkSettings::serverName() uses native API which assumes // Cleanup-stack to exist. That's why we create it here and install @@ -346,9 +347,18 @@ public: qWarning() << "Please configure the test environment!"; qWarning() << "See /etc/hosts or network-settings.h"; qFatal("Exiting"); - } - ) + } + ) delete cleanupStack; +#else + QHostInfo testServerResult = QHostInfo::fromName(QtNetworkSettings::serverName()); + if (testServerResult.error() != QHostInfo::NoError) { + qWarning() << "Could not lookup" << QtNetworkSettings::serverName(); + qWarning() << "Please configure the test environment!"; + qWarning() << "See /etc/hosts or network-settings.h"; + qFatal("Exiting"); + } +#endif } }; QtNetworkSettingsInitializerCode qtNetworkSettingsInitializer; -- cgit v0.12