From 50b9a4b357376c13ee00e060b44a1e505c632592 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 5 May 2021 11:17:22 +0200 Subject: Remove Qt6 switches from QtGui Removing now dead code Change-Id: I021539da6517fdb8443f8ae9431fc172b7910cfc Reviewed-by: Friedemann Kleint --- src/gui/text/qtextlayout.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/gui/text/qtextlayout.h') 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 -#endif - QTextLayout(const QString &textData, const QFont &textFont, const QPaintDevice *paintdevice) - : QTextLayout(textData, textFont, const_cast(paintdevice)) - {} -#else QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice = nullptr); -#endif QTextLayout(const QTextBlock &b); ~QTextLayout(); -- cgit v1.2.3