diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-29 16:31:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-30 21:15:40 +0200 |
| commit | cc692bb58c8a39f06eb30c04cfcb61fa466d18ae (patch) | |
| tree | 3e32794fa51a2d85356596710b11c8290388b8da /src/gui/painting | |
| parent | 47ae99a07ab5726e5316d56f0ca3ce958cd85ac5 (diff) | |
Get rid of some #ifdef qt6
None of this code is even compiled in qt6.
Change-Id: I5891cc9459320083ad3908fcbf646f3ba75b8a4d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 14 | ||||
| -rw-r--r-- | src/gui/painting/qcolor.h | 2 |
2 files changed, 1 insertions, 15 deletions
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); } |