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

Add support for Qt6 and disable Qt5

Browse Source 
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
This commit is contained in:
Magne Sjaastad
2024-09-30 11:21:17 +02:00
committed by GitHub
parent 596ab564c8
commit 212f5bf5ae
51 changed files with 499 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@@ -19,10 +19,12 @@
#include "RifEclipseSummaryAddress.h"
#include "RiaStdStringTools.h"
#include "RiaTextStringTools.h"
#include "RifEclEclipseSummary.h"
#include "RiuSummaryQuantityNameInfoProvider.h"
#include <QRegExp>
#include <QStringList>
#include <QTextStream>
@@ -1213,7 +1215,7 @@ std::string RifEclipseSummaryAddress::blockAsString() const
//--------------------------------------------------------------------------------------------------
std::tuple<int, int, int> RifEclipseSummaryAddress::ijkTupleFromUiText( const std::string& s )
{
QStringList ijk = QString().fromStdString( s ).trimmed().split( QRegExp( "[,]" ) );
auto ijk = RiaTextStringTools::splitSkipEmptyParts( QString::fromStdString( s ).trimmed(), QRegExp( "[,]" ) );
if ( ijk.size() != 3 ) return std::make_tuple( -1, -1, -1 );
@@ -1235,7 +1237,7 @@ std::string RifEclipseSummaryAddress::formatUiTextRegionToRegion() const
//--------------------------------------------------------------------------------------------------
std::pair<int, int> RifEclipseSummaryAddress::regionToRegionPairFromUiText( const std::string& s )
{
QStringList r2r = QString().fromStdString( s ).trimmed().split( QRegExp( "[-]" ) );
auto r2r = RiaTextStringTools::splitSkipEmptyParts( QString::fromStdString( s ).trimmed(), QRegExp( "[-]" ) );
if ( r2r.size() != 2 ) return std::make_pair( -1, -1 );