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

Several adjustments related to Qt6

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/RicGridStatisticsDialog.cpp
View File

@@ -79,7 +79,7 @@ RicGridStatisticsDialog::RicGridStatisticsDialog( QWidget* parent )
dialogLayout->addWidget( m_mainViewWidget );
QVBoxLayout* mainViewLayout = new QVBoxLayout();
mainViewLayout->setMargin( 0 );
mainViewLayout->setContentsMargins( 0, 0, 0, 0 );
m_mainViewWidget->setLayout( mainViewLayout );
mainViewLayout->addWidget( m_label );
mainViewLayout->addWidget( m_textEdit );

3
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.h
View File

@@ -18,6 +18,7 @@
#pragma once
#include <QString>
#include <QStringList>
#include <set>
#include <vector>
@@ -35,8 +36,6 @@ class RimSummaryCase;
class RimSummaryCaseCollection;
class RimEnsembleCurveSet;
class QStringList;
class RicSummaryPlotFeatureImpl
{
public: