From e97025a81e1ec72db89f6940358f411f1af63191 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 9 Jul 2020 15:17:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=BA=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D0=B0=20QT=5FVERSION?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/myx/backports/qt/common.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/myx/backports/qt/common.hpp b/src/myx/backports/qt/common.hpp index 55f68b1..f225fb0 100644 --- a/src/myx/backports/qt/common.hpp +++ b/src/myx/backports/qt/common.hpp @@ -3,10 +3,11 @@ #pragma once -#if defined( QT_VERSION ) - -#if QT_VERSION <= 0x050700 +#if !defined( QT_VERSION ) #include +#endif + +#if (QT_VERSION <= 0x050700) template< typename ... Args > struct QOverload { @@ -29,9 +30,6 @@ Q_DECL_CONSTEXPR typename std::add_const< T >::type& qAsConst( T& t ) noexcept template < typename T > void qAsConst( const T&& ) = delete; - #endif // if QT_VERSION <= 0x050700 -#endif // if defined( QT_VERSION ) - #endif // MYX_BACKPORTS_QT_COMMON_HPP_