Skip to content

Commit

Permalink
Remove old MSVC & MinGW compiler versions
Browse files Browse the repository at this point in the history
- fix vs2013 build failure by adding a missing header
  • Loading branch information
Chang, Matt authored and chchwy committed Apr 30, 2024
1 parent 8c3b530 commit 4711ef1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 48 deletions.
1 change: 1 addition & 0 deletions app/src/generalpage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ GNU General Public License for more details.

#include "generalpage.h"

#include <memory>
#include <QMessageBox>
#include <QSettings>
#include <QTranslator>
Expand Down
26 changes: 1 addition & 25 deletions util/appveyor-mingw.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@

clone_depth: 3
clone_depth: 1

image:
- Visual Studio 2019
- Visual Studio 2017
- Visual Studio 2015

platform:
- x86
Expand All @@ -19,8 +17,6 @@ skip_commits:
init:
- ver
- echo %PLATFORM%
# - dir C:\Qt
# - dir C:\Qt\Tools\

before_build:
- set QTDIR=C:\Qt\%qt%
Expand Down Expand Up @@ -51,23 +47,3 @@ for:
- if %PLATFORM%==x64 set qt=5.15\mingw81_64
- if %PLATFORM%==x86 set mingw=mingw810_32
- if %PLATFORM%==x64 set mingw=mingw810_64
- matrix:
only:
- image: Visual Studio 2017
install:
- if %PLATFORM%==x86 set qt=5.12\mingw73_32
- if %PLATFORM%==x64 set qt=5.12\mingw73_64
- if %PLATFORM%==x86 set mingw=mingw730_32
- if %PLATFORM%==x64 set mingw=mingw730_64

- matrix:
only:
- image: Visual Studio 2015
install:
- if %PLATFORM%==x86 set qt=5.9\mingw53_32
- if %PLATFORM%==x86 set mingw=mingw530_32

matrix:
exclude:
- image: Visual Studio 2015
platform: x64
24 changes: 1 addition & 23 deletions util/appveyor-msvc.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@

clone_depth: 3
clone_depth: 1

image:
- Visual Studio 2019
- Visual Studio 2017
- Visual Studio 2015
- Visual Studio 2013

platform:
Expand Down Expand Up @@ -49,26 +47,6 @@ for:
- if %PLATFORM%==x64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
- if %PLATFORM%==x86 set qt=5.15\msvc2019
- if %PLATFORM%==x64 set qt=5.15\msvc2019_64

- matrix:
only:
- image: Visual Studio 2017
install:
- if %PLATFORM%==x86 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
- if %PLATFORM%==x64 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- if %PLATFORM%==x86 set qt=5.12\msvc2017
- if %PLATFORM%==x64 set qt=5.12\msvc2017_64

- matrix:
only:
- image: Visual Studio 2015
install:
- if %PLATFORM%==x86 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
- if %PLATFORM%==x64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- if %PLATFORM%==x64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
- if %PLATFORM%==x86 set qt=5.9\msvc2015
- if %PLATFORM%==x64 set qt=5.9\msvc2015_64

- matrix:
only:
- image: Visual Studio 2013
Expand Down

0 comments on commit 4711ef1

Please sign in to comment.