Skip to content

Commit 1f4c2fb

Browse files
committed
downgrading qt version
1 parent ddf2020 commit 1f4c2fb

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

.github/workflows/linux_release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ defaults:
1919

2020
env:
2121
SOURCE_DIR: ${{ github.workspace }}
22-
#QT_VERSION: 6.5.3
23-
QT_VERSION: 6.8.1
22+
QT_VERSION: 6.5.3
23+
#QT_VERSION: 6.8.3
2424
ARTIFACT: "CS3MapEdit-x86_64.AppImage"
2525

2626
jobs:
@@ -34,7 +34,7 @@ jobs:
3434
submodules: recursive
3535

3636
- name: Install Qt
37-
uses: jurplel/install-qt-action@v3
37+
uses: jurplel/install-qt-action@v4
3838
with:
3939
version: ${{ env.QT_VERSION }}
4040
host: linux
@@ -44,6 +44,8 @@ jobs:
4444
#modules: #qtcharts qt3d
4545
setup-python: false
4646

47+
48+
4749
- name: Create build directory
4850
run: mkdir ${{ env.SOURCE_DIR }}/build
4951

@@ -83,3 +85,4 @@ jobs:
8385
with:
8486
name: ${{ env.ARTIFACT }}
8587
path: ${{ env.SOURCE_DIR }}/build/release
88+
expire_in: 1 week

.github/workflows/windows_release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- "master"
7-
- "continuous-integration"
7+
# - "continuous-integration"
88
tags:
99
- "v*"
1010
pull_request:
1111
branches:
1212
- "master"
13-
- "continuous-integration"
13+
# - "continuous-integration"
1414

1515
defaults:
1616
run:
@@ -20,7 +20,7 @@ env:
2020
BUILD_TYPE: Release
2121
SOURCE_DIR: ${{ github.workspace }}
2222
#QT_VERSION: 6.5.3
23-
QT_VERSION: 6.8.1
23+
QT_VERSION: 6.7.1
2424
ARTIFACT: CS3MapEdit_Win64
2525
ARCH: win64_msvc2019_64
2626
HOST: windows
@@ -136,3 +136,4 @@ jobs:
136136
with:
137137
name: ${{ env.ARTIFACT }}
138138
path: ${{ runner.temp }}\build\release
139+
expire_in: 1 week

src/mapedit.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,5 @@ contains(DEFINES, USE_SDL_MIXER=1){
111111
SOURCES += shared/implementers/sn_sdl.cpp
112112
}
113113

114-
QMAKE_CXXFLAGS_RELEASE += -std=c++17 -O3
115-
QMAKE_CXXFLAGS_DEBUG += -std=c++17 -g3
114+
QMAKE_CXXFLAGS_RELEASE += -std=c++20 -O3
115+
QMAKE_CXXFLAGS_DEBUG += -std=c++20 -g3

src/states.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
#include "states.h"
1919
#include "shared/IFile.h"
20-
#include <format>
20+
//#include <format>
2121

2222
CStates::CStates()
2323
{
@@ -206,12 +206,14 @@ void CStates::debug()
206206

207207
void CStates::getValues(std::vector<StateValuePair> & pairs)
208208
{
209+
// C++ 20 not supported yet
210+
// std::format("0x{:02x}", v)
209211
pairs.clear();
210-
//char tmp[16];
212+
char tmp[16];
211213
for (const auto &[k, v] : m_stateU)
212214
{
213-
//sprintf(tmp, "0x%.2x", v);
214-
pairs.push_back({k, v ? std::format("0x{:02x}", v) : ""});
215+
sprintf(tmp, "0x%.2x", v);
216+
pairs.push_back({k, v ? tmp : ""});
215217
}
216218

217219
for (const auto &[k, v] : m_stateS)

0 commit comments

Comments
 (0)