[QGIS Commit] r13462 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-10 12:37:11 -0400 (Mon, 10 May 2010)
New Revision: 13462

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
Log:
fix ssl preprocessor logic

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-05-10 13:50:57 UTC (rev 13461)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-05-10 16:37:11 UTC (rev 13462)
@@ -6529,7 +6529,7 @@
   connect( nam, SIGNAL( proxyAuthenticationRequired( const QNetworkProxy &, QAuthenticator * ) ),
            this, SLOT( namProxyAuthenticationRequired( const QNetworkProxy &, QAuthenticator * ) ) );
 
-#ifdef QT_OPENSSL
+#ifndef QT_NO_OPENSSL
   connect( nam, SIGNAL( sslErrors( QNetworkReply *, const QList<QSslError> & ) ),
            this, SLOT( namSslErrors( QNetworkReply *, const QList<QSslError> & ) ) );
 #endif
@@ -6567,7 +6567,7 @@
   auth->setPassword( password );
 }
 
-#ifdef QT_OPENSSL
+#ifndef QT_NO_OPENSSL
 void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors )
 {
   QString msg = tr( "SSL errors occured accessing URL %1:" ).arg( reply->request().url().toString() );

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2010-05-10 13:50:57 UTC (rev 13461)
+++ trunk/qgis/src/app/qgisapp.h	2010-05-10 16:37:11 UTC (rev 13462)
@@ -404,7 +404,7 @@
     //! request credentials for network manager
     void namAuthenticationRequired( QNetworkReply *reply, QAuthenticator *auth );
     void namProxyAuthenticationRequired( const QNetworkProxy &proxy, QAuthenticator *auth );
-#ifdef QT_OPENSSL
+#ifndef QT_NO_OPENSSL
     void namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors );
 #endif