Several adjustments related to Qt6

* Avoid ambiguous definition during unity build on Windows
* Add missing include
* Add Qt6 to expressionparser
* Add Qt6 to nightcharts
* Replace forward define of QStringList with include <QStringList>
* Use toMSecsSinceEpoch
* Use setContentsMargins
This commit is contained in:
Magne Sjaastad
2024-04-16 14:22:15 +02:00
committed by GitHub
parent 39b9a25faa
commit 030688cff6
30 changed files with 81 additions and 49 deletions

View File

@@ -72,7 +72,7 @@ auto RiaRftPltCurveDefinition::operator<=>( const RiaRftPltCurveDefinition& othe
{
if ( m_wellName == other.m_wellName )
{
return m_timeStep.toTime_t() <=> other.m_timeStep.toTime_t();
return m_timeStep.toMSecsSinceEpoch() <=> other.m_timeStep.toMSecsSinceEpoch();
}
return m_wellName.toStdString() <=> other.m_wellName.toStdString();
}

View File

@@ -19,8 +19,7 @@
#pragma once
#include <QString>
class QStringList;
#include <QStringList>
//--------------------------------------------------------------------------------------------------
///

View File

@@ -18,13 +18,14 @@
#pragma once
#include <QStringList>
#include <map>
#include <memory>
#include <utility>
#include <vector>
class QString;
class QStringList;
class RimIdenticalGridCaseGroup;
class RimRoffCase;

View File

@@ -18,6 +18,8 @@
#pragma once
#include <QStringList>
#include <set>
#include <vector>
@@ -26,7 +28,6 @@ class RifEclipseSummaryAddress;
class RimSummaryCaseCollection;
class QString;
class QStringList;
//==================================================================================================
//

View File

@@ -22,6 +22,7 @@
#include "RimObservedDataCollection.h"
#include <QString>
#include <QStringList>
#include <vector>
@@ -38,8 +39,6 @@ class RimObservedDataCollection;
class RimSummaryCurve;
class RimUserDefinedCalculation;
class QStringList;
namespace caf
{
class PdmObject;

View File

@@ -19,9 +19,9 @@
#pragma once
#include <QString>
#include <map>
#include <QStringList>
class QStringList;
#include <map>
//--------------------------------------------------------------------------------------------------
///