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 qt-version to matrix configuration

Browse Source
This commit is contained in:
Magne Sjaastad
2024-09-06 11:02:31 +02:00
parent a443655b42
commit 7ba4329bb4
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ResInsightWithCache.yml vendored
View File

@@ -37,6 +37,7 @@ jobs:
publish-to-pypi: false, publish-to-pypi: false,
vcpkg-bootstrap: bootstrap-vcpkg.bat, vcpkg-bootstrap: bootstrap-vcpkg.bat,
vcpkg-triplet: x64-windows-release, vcpkg-triplet: x64-windows-release,
qt-version: 5.12.12,
} }
- { - {
name: "Ubuntu 22.04 gcc", name: "Ubuntu 22.04 gcc",
@@ -50,6 +51,7 @@ jobs:
publish-to-pypi: true, publish-to-pypi: true,
vcpkg-bootstrap: bootstrap-vcpkg.sh, vcpkg-bootstrap: bootstrap-vcpkg.sh,
vcpkg-triplet: x64-linux-release, vcpkg-triplet: x64-linux-release,
qt-version: 5.12.12,
} }
- { - {
name: "Ubuntu 22.04 clang-16", name: "Ubuntu 22.04 clang-16",
@@ -63,6 +65,7 @@ jobs:
publish-to-pypi: false, publish-to-pypi: false,
vcpkg-bootstrap: bootstrap-vcpkg.sh, vcpkg-bootstrap: bootstrap-vcpkg.sh,
vcpkg-triplet: x64-linux-release, vcpkg-triplet: x64-linux-release,
qt-version: 5.12.12,
} }
steps: steps:
- name: Checkout - name: Checkout
@@ -172,7 +175,7 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: 5.12.12 version: ${{ matrix.config.qt-version }}
dir: "${{ github.workspace }}/Qt/" dir: "${{ github.workspace }}/Qt/"
cache: true cache: true
modules: "qtnetworkauth" modules: "qtnetworkauth"

2
ApplicationLibCode/Application/Tools/Cloud/RiaCloudConnector.cpp
View File

@@ -28,9 +28,9 @@
#include <QEventLoop> #include <QEventLoop>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QtNetworkAuth/QOAuth2AuthorizationCodeFlow>
#include <QTimer> #include <QTimer>
#include <QUrlQuery> #include <QUrlQuery>
#include <QtNetworkAuth/QOAuth2AuthorizationCodeFlow>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

2
ApplicationLibCode/Application/Tools/Cloud/RiaOAuthHttpServerReplyHandler.h
View File

@@ -18,9 +18,9 @@
#pragma once #pragma once
#include <QtNetworkAuth/QOAuthHttpServerReplyHandler>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QtNetworkAuth/QOAuthHttpServerReplyHandler>
//================================================================================================== //==================================================================================================
/// ///