From cc692bb58c8a39f06eb30c04cfcb61fa466d18ae Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 29 Sep 2020 16:31:53 +0200 Subject: Get rid of some #ifdef qt6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit None of this code is even compiled in qt6. Change-Id: I5891cc9459320083ad3908fcbf646f3ba75b8a4d Reviewed-by: Tor Arne Vestbø Reviewed-by: Sona Kurazyan Reviewed-by: Thiago Macieira --- src/gui/painting/qcolor.cpp | 14 -------------- src/gui/painting/qcolor.h | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'src/gui/painting') diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 54a0fcf011..46f212fa7a 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -841,20 +841,6 @@ QColor::QColor(Spec spec) noexcept \sa setNamedColor(), name(), isValid() */ -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -/*! -\if !defined(qt6) - \fn QColor::QColor(const QColor &color) - - Constructs a color that is a copy of \a color. - - \sa isValid() -\else - \nothing -\endif -*/ -#endif - /*! \fn bool QColor::isValid() const diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 03129e8241..1899457b67 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -297,7 +297,7 @@ public: // can't give friendship to a namespace, so it needs to be public : cspec(spec), ct(a1, a2, a3, a4, a5) {} #endif // Q_COMPILER_UNIFORM_INIT }; -Q_DECLARE_TYPEINFO(QColor, QT_VERSION >= QT_VERSION_CHECK(6,0,0) ? Q_MOVABLE_TYPE : Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QColor, Q_MOVABLE_TYPE); inline QColor::QColor(QLatin1String aname) { setNamedColor(aname); } -- cgit v1.2.3