Skip to content

Commit ee1956d

Browse files
Fix build without C++11 support
1 parent ec87f10 commit ee1956d

File tree

6 files changed

+34
-9
lines changed

6 files changed

+34
-9
lines changed

src/ThirdParty/QtImageFormats/patches/qtimageformats/0001-Use-Q_DECL_OVERRIDE-instead-of-override.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 08f1e18405e2c432f4252705bd3b98a563d761a3 Mon Sep 17 00:00:00 2001
1+
From 10aaada16c8e19b64c3ef3526dc135aefe9313d5 Mon Sep 17 00:00:00 2001
22
From: Peter Zhigalov <[email protected]>
33
Date: Sat, 10 Mar 2018 15:40:08 +0700
4-
Subject: [PATCH 1/4] Use "Q_DECL_OVERRIDE" instead of "override"
4+
Subject: [PATCH 1/5] Use "Q_DECL_OVERRIDE" instead of "override"
55

66
---
77
src/plugins/imageformats/dds/qddshandler.h | 18 ++++++-------

src/ThirdParty/QtImageFormats/patches/qtimageformats/0002-Dont-use-modern-options-with-old-Qt-verson.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 6e51e3bab1ef2a140fc17d97bfc94a29e7340034 Mon Sep 17 00:00:00 2001
1+
From 4baaa99203a27d4d97e621c290ff1261214bff61 Mon Sep 17 00:00:00 2001
22
From: Peter Zhigalov <[email protected]>
33
Date: Sun, 17 Jun 2018 19:52:22 +0700
4-
Subject: [PATCH 2/4] Dont use modern options with old Qt verson
4+
Subject: [PATCH 2/5] Dont use modern options with old Qt verson
55

66
---
77
src/plugins/imageformats/dds/qddshandler.cpp | 7 ++++++-

src/ThirdParty/QtImageFormats/patches/qtimageformats/0003-Use-custom-third-party-libraries-paths.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 6ae19c4845835e81a08ce7920d483a444111083b Mon Sep 17 00:00:00 2001
1+
From 74e858d71afe5c64427167e80867e4d3057e5e16 Mon Sep 17 00:00:00 2001
22
From: Peter Zhigalov <[email protected]>
33
Date: Sun, 14 May 2017 23:13:29 +0700
4-
Subject: [PATCH 3/4] Use custom third-party libraries paths
4+
Subject: [PATCH 3/5] Use custom third-party libraries paths
55

66
---
77
src/3rdparty/zlib_dependency.pri | 11 ++++++-----

src/ThirdParty/QtImageFormats/patches/qtimageformats/0004-Fix-handling-icns-files-with-JPEG-2000-frames.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From ddc936f884b8f1dc5e4daa67f0020d0d9e1f2ca2 Mon Sep 17 00:00:00 2001
1+
From 06bd6b66bf88eb6bbcc8233f2f8bbaf19b2f380e Mon Sep 17 00:00:00 2001
22
From: Peter Zhigalov <[email protected]>
33
Date: Mon, 15 May 2017 00:06:30 +0700
4-
Subject: [PATCH 4/4] Fix handling icns files with JPEG 2000 frames
4+
Subject: [PATCH 4/5] Fix handling icns files with JPEG 2000 frames
55

66
---
77
src/plugins/imageformats/icns/qicnshandler.cpp | 15 ++++++++++++++-
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 5a2cf5748c68a6447f7b58c04c62a346583d32ef Mon Sep 17 00:00:00 2001
2+
From: Peter Zhigalov <[email protected]>
3+
Date: Sun, 17 Jun 2018 21:58:03 +0700
4+
Subject: [PATCH 5/5] Dont use C++11 'default' constructors
5+
6+
---
7+
src/plugins/imageformats/tga/qtgafile.cpp | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/plugins/imageformats/tga/qtgafile.cpp b/src/plugins/imageformats/tga/qtgafile.cpp
11+
index ea48f99..089f105 100644
12+
--- a/src/plugins/imageformats/tga/qtgafile.cpp
13+
+++ b/src/plugins/imageformats/tga/qtgafile.cpp
14+
@@ -47,7 +47,7 @@ struct TgaReader
15+
{
16+
Q_DISABLE_COPY(TgaReader)
17+
18+
- TgaReader() = default;
19+
+ TgaReader() {}
20+
21+
virtual ~TgaReader() {}
22+
virtual QRgb operator()(QIODevice *s) const = 0;
23+
--
24+
2.17.1
25+

src/ThirdParty/QtImageFormats/qtimageformats/src/plugins/imageformats/tga/qtgafile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct TgaReader
4747
{
4848
Q_DISABLE_COPY(TgaReader)
4949

50-
TgaReader() = default;
50+
TgaReader() {}
5151

5252
virtual ~TgaReader() {}
5353
virtual QRgb operator()(QIODevice *s) const = 0;

0 commit comments

Comments
 (0)