diff --git a/Telegram/_qt_5_5_0_patch.diff b/Telegram/_qt_5_5_0_patch.diff index ea73098ad..d713f4ae5 100644 --- a/Telegram/_qt_5_5_0_patch.diff +++ b/Telegram/_qt_5_5_0_patch.diff @@ -65,7 +65,7 @@ index 0907653..96f6e19 100644 /* High surrogate. Must be a followed by a low surrogate. */ if (length == 0) 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 +++ b/qtbase/src/corelib/kernel/qobjectdefs.h @@ -142,7 +142,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {} @@ -73,7 +73,7 @@ index 4d01264..fd3854f 100644 #endif -#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") #else # define Q_OBJECT_NO_OVERRIDE_WARNING diff --git a/Telegram/_qt_5_5_0_patch/qtbase/src/corelib/kernel/qobjectdefs.h b/Telegram/_qt_5_5_0_patch/qtbase/src/corelib/kernel/qobjectdefs.h index fd3854fd5..9bee4732c 100644 --- a/Telegram/_qt_5_5_0_patch/qtbase/src/corelib/kernel/qobjectdefs.h +++ b/Telegram/_qt_5_5_0_patch/qtbase/src/corelib/kernel/qobjectdefs.h @@ -142,7 +142,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {} # define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN #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") #else # define Q_OBJECT_NO_OVERRIDE_WARNING