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/qtextlayout.cpp | |
| 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/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
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); |