procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

qt patch updated, version 0.8.41.dev

This commit is contained in:
John Preston 2015-07-21 17:40:51 +02:00
parent 20e7d9e036
commit af7cd9680d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/_qt_5_5_0_patch.diff
View File

@ -65,7 +65,7 @@ index 0907653..96f6e19 100644
/* High surrogate. Must be a followed by a low surrogate. */ /* High surrogate. Must be a followed by a low surrogate. */
if (length == 0) if (length == 0)
diff --git a/qtbase/src/corelib/kernel/qobjectdefs.h b/qtbase/src/corelib/kernel/qobjectdefs.h diff --git a/qtbase/src/corelib/kernel/qobjectdefs.h b/qtbase/src/corelib/kernel/qobjectdefs.h
index 4d01264..fd3854f 100644 index 4d01264..9bee473 100644
--- a/qtbase/src/corelib/kernel/qobjectdefs.h --- a/qtbase/src/corelib/kernel/qobjectdefs.h
+++ b/qtbase/src/corelib/kernel/qobjectdefs.h +++ b/qtbase/src/corelib/kernel/qobjectdefs.h
@@ -142,7 +142,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {} @@ -142,7 +142,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {}
@ -73,7 +73,7 @@ index 4d01264..fd3854f 100644
#endif #endif
-#if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306 -#if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306
+#if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306 && false +#if defined(Q_CC_CLANG) && (Q_CC_CLANG >= 306) && 0
# define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override") # define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override")
#else #else
# define Q_OBJECT_NO_OVERRIDE_WARNING # define Q_OBJECT_NO_OVERRIDE_WARNING

2
Telegram/_qt_5_5_0_patch/qtbase/src/corelib/kernel/qobjectdefs.h
View File

@ -142,7 +142,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {}
# define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN # define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN
#endif #endif
#if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306 && false #if defined(Q_CC_CLANG) && (Q_CC_CLANG >= 306) && 0
# define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override") # define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override")
#else #else
# define Q_OBJECT_NO_OVERRIDE_WARNING # define Q_OBJECT_NO_OVERRIDE_WARNING