OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove ifdefs for Qt4 support.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-05-12 09:00:20 +02:00
committed by Magne Sjaastad
parent 2bc677b8c8
commit 8211727b79
8 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp
View File

@@ -528,16 +528,6 @@ QString RicHoloLensRestClient::networkErrorCodeAsString( QNetworkReply::NetworkE
//--------------------------------------------------------------------------------------------------
qint64 RicHoloLensRestClient::getCurrentTimeStamp_ms()
{
#if QT_VERSION >= 0x040700
const qint64 timeStamp_ms = QDateTime::currentMSecsSinceEpoch();
return timeStamp_ms;
#elif defined( __linux__ )
struct timespec ts;
if ( clock_gettime( CLOCK_MONOTONIC, &ts ) == 0 )
{
return static_cast<qint64>( ts.tv_sec * 1000 + ts.tv_nsec / 1000000 );
}
#else
return 0;
#endif
}

10
ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp
View File

@@ -41,12 +41,8 @@
#include <QSslConfiguration>
#include <QSslSocket>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QtNetwork>
#include <QtWidgets>
#include <algorithm>
@@ -349,11 +345,7 @@ void RiuWellImportWizard::startRequest( QUrl url )
if ( supportsSsl )
{
QSslConfiguration config = QSslConfiguration::defaultConfiguration();
#if QT_VERSION >= 0x050000
config.setProtocol( QSsl::TlsV1_0 );
#else
config.setProtocol( QSsl::TlsV1 );
#endif
request.setSslConfiguration( config );
}
#endif

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp
View File

@@ -124,11 +124,7 @@ QWidget* RicSummaryCurveCalculatorWidgetCreator::createWidget( QWidget* parent )
m_pdmTableView->enableHeaderText( false );
QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader();
#if QT_VERSION >= 0x050000
verticalHeader->setSectionResizeMode( QHeaderView::Interactive );
#else
verticalHeader->setResizeMode( QHeaderView::Interactive );
#endif
m_pdmTableView->tableView()->resizeColumnsToContents();