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

4
ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
View File

@@ -138,13 +138,13 @@ public:
{
int lineCount = 1 + posTickTypeText.second.label.count( "\n" );
mediumTextLineCount = std::max( mediumTextLineCount, lineCount );
medTickMaxTextSize = std::max( posTickTypeText.second.label.size(), medTickMaxTextSize );
medTickMaxTextSize = std::max( (int)posTickTypeText.second.label.size(), medTickMaxTextSize );
}
else if ( posTickTypeText.second.tickType == QwtScaleDiv::MinorTick )
{
int lineCount = 1 + posTickTypeText.second.label.count( "\n" );
minorTextLineCount = std::max( minorTextLineCount, lineCount );
minTickMaxTextSize = std::max( posTickTypeText.second.label.size(), minTickMaxTextSize );
minTickMaxTextSize = std::max( (int)posTickTypeText.second.label.size(), minTickMaxTextSize );
}
}