diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-05 11:17:22 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-05 19:26:56 +0200 |
commit | 50b9a4b357376c13ee00e060b44a1e505c632592 (patch) | |
tree | f18b8290b3e33ea5875233dae718830bc9a352e6 /src/gui/text | |
parent | 93038767b71559f1606c787f97d7c307fba82723 (diff) |
Remove Qt6 switches from QtGui
Removing now dead code
Change-Id: I021539da6517fdb8443f8ae9431fc172b7910cfc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/text')
-rw-r--r-- | src/gui/text/qfont.cpp | 10 | ||||
-rw-r--r-- | src/gui/text/qfont.h | 3 | ||||
-rw-r--r-- | src/gui/text/qtextlayout.cpp | 14 | ||||
-rw-r--r-- | src/gui/text/qtextlayout.h | 12 |
4 files changed, 0 insertions, 39 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 45310d0406..4b2e257231 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -616,16 +616,6 @@ QFontEngineData::~QFontEngineData() \since 5.2 */ -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -/* - \obsolete - Constructs a font from \a font for use on the paint device \a pd. -*/ -QFont::QFont(const QFont &font, QPaintDevice *pd) - : QFont(font, static_cast<const QPaintDevice*>(pd)) -{} -#endif - /*! \since 5.13 Constructs a font from \a font for use on the paint device \a pd. diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index fa17011fe2..87fc08dda9 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -169,9 +169,6 @@ public: QFont(); QFont(const QString &family, int pointSize = -1, int weight = -1, bool italic = false); explicit QFont(const QStringList &families, int pointSize = -1, int weight = -1, bool italic = false); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QFont(const QFont &font, QPaintDevice *pd); -#endif QFont(const QFont &font, const QPaintDevice *pd); QFont(const QFont &font); ~QFont(); diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index b37baaf655..48f26f8665 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -352,21 +352,7 @@ QTextLayout::QTextLayout(const QString& text) calculations will be done in screen metrics. */ -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -/*! -\if !defined(qt6) - \fn QTextLayout::QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice) - \obsolete - Identical to QTextLayout::QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) -\else - \nothing -\endif -*/ - -QTextLayout::QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice) -#else QTextLayout::QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) -#endif { const QFont f(paintdevice ? QFont(font, paintdevice) : font); d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f); diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 16dde50f05..5c6dead276 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -108,19 +108,7 @@ public: // does itemization QTextLayout(); QTextLayout(const QString& text); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice = nullptr); -#ifndef Q_QDOC - // the template is necessary to make QTextLayout(font,text,nullptr) and QTextLayout(font,text,NULL) - // not ambiguous. Implementation detail that should not be documented. - template<char = 0> -#endif - QTextLayout(const QString &textData, const QFont &textFont, const QPaintDevice *paintdevice) - : QTextLayout(textData, textFont, const_cast<QPaintDevice*>(paintdevice)) - {} -#else QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice = nullptr); -#endif QTextLayout(const QTextBlock &b); ~QTextLayout(); |