OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add MacOS build support

Browse Source
This commit is contained in:
Magne Sjaastad
2021-04-05 09:39:12 -07:00
parent 6e45d51e4e
commit 2d9ac615f2
8 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp
+4 -3
View File
@@ -76,7 +76,8 @@ RiuWellImportWizard::RiuWellImportWizard( const QString& webServiceAddress,
SIGNAL( authenticationRequired( QNetworkReply*, QAuthenticator* ) ),
this,
SLOT( slotAuthenticationRequired( QNetworkReply*, QAuthenticator* ) ) );
#ifndef QT_NO_OPENSSL
#if !defined( QT_NO_OPENSSL ) && !defined( CVF_OSX )
connect( &m_networkAccessManager,
SIGNAL( sslErrors( QNetworkReply*, QList<QSslError> ) ),
this,
@@ -305,7 +306,7 @@ void RiuWellImportWizard::slotAuthenticationRequired( QNetworkReply* networkRepl
}
}
#ifndef QT_NO_OPENSSL
#if !defined( QT_NO_OPENSSL ) && !defined( CVF_OSX )
void RiuWellImportWizard::sslErrors( QNetworkReply*, const QList<QSslError>& errors )
{
QString errorString;
@@ -340,7 +341,7 @@ void RiuWellImportWizard::startRequest( QUrl url )
{
auto request = QNetworkRequest( url );
#ifndef QT_NO_OPENSSL
#if !defined( QT_NO_OPENSSL ) && !defined( CVF_OSX )
bool supportsSsl = QSslSocket::supportsSsl();
if ( supportsSsl )
{
ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.h
+1 -1
View File
@@ -228,7 +228,7 @@ public slots:
int wellSelectionPageId();
#ifndef QT_NO_OPENSSL
#if !defined(QT_NO_OPENSSL) && !defined(CVF_OSX)
void sslErrors( QNetworkReply*, const QList<QSslError>& errors );
#endif