summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextlayout.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-05 11:17:22 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-05 19:26:56 +0200
commit50b9a4b357376c13ee00e060b44a1e505c632592 (patch)
treef18b8290b3e33ea5875233dae718830bc9a352e6 /src/gui/text/qtextlayout.h
parent93038767b71559f1606c787f97d7c307fba82723 (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/qtextlayout.h')
-rw-r--r--src/gui/text/qtextlayout.h12
1 files changed, 0 insertions, 12 deletions
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();