blob: 544bf2992c6ae760bf0ae32d0cd371358df45220 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From 11cb5eb99836e043d71b556af010b29624c3f569 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 26 Nov 2017 22:51:36 +0100
Subject: [PATCH] Qt 5.8.0 compatibility
---
scripts/mkqtdecl5/mkqtdecl.conf | 2 ++
src/gsiqt5/gsiDeclQtTypeTraits.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
index a704ebc..ee58b82 100644
--- a/scripts/mkqtdecl5/mkqtdecl.conf
+++ b/scripts/mkqtdecl5/mkqtdecl.conf
@@ -1484,6 +1484,8 @@ final_class "QAccessibleObject" # because navigate cannot be implemented
# final_class "QAccessiblePlugin" # because navigate cannot be implemented
final_class "QAccessibleWidget" # because navigate cannot be implemented
+no_copy_ctor "QIconEngine"
+
# --------------------------------------------------------------
# QtXml
diff --git a/src/gsiqt5/gsiDeclQtTypeTraits.h b/src/gsiqt5/gsiDeclQtTypeTraits.h
index eba0986..dd68128 100644
--- a/src/gsiqt5/gsiDeclQtTypeTraits.h
+++ b/src/gsiqt5/gsiDeclQtTypeTraits.h
@@ -3418,6 +3418,7 @@ template <> struct type_traits<QIconEngine> : public type_traits<void> {
class QIconEngine_Adaptor;
namespace tl {
template <> struct type_traits<QIconEngine_Adaptor> : public type_traits<void> {
+ typedef tl::false_tag has_copy_constructor;
};
}
--
2.15.1
|
GitWeb
