1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Qt6 switches from QtGui

Browse Source 
Removing now dead code

Change-Id: I021539da6517fdb8443f8ae9431fc172b7910cfc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2021-05-05 11:17:22 +02:00
parent 93038767b7
commit 50b9a4b357
14 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/image/qimageiohandler.h
View File

@ -94,9 +94,6 @@ public:
OptimizedWrite,
ProgressiveScanWrite,
ImageTransformation
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
, TransformedByDefault
#endif
};
enum Transformation {

4
src/gui/image/qimagereader.cpp
View File

@ -1142,10 +1142,6 @@ bool QImageReader::autoTransform() const
case QImageReaderPrivate::DoNotApplyTransform:
return false;
case QImageReaderPrivate::UsePluginDefault:
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (d->initHandler())
return d->handler->supportsOption(QImageIOHandler::TransformedByDefault);
#endif
Q_FALLTHROUGH();
default:
break;

4
src/gui/kernel/qguiapplication.cpp
View File

@ -1994,11 +1994,7 @@ bool QGuiApplicationPrivate::sendQWindowEventToQPlatformWindow(QWindow *window,
return platformWindow->windowEvent(event);
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool QGuiApplicationPrivate::processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result)
#else
bool QGuiApplicationPrivate::processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result)
#endif
{
return window->nativeEvent(eventType, message, result);
}

4
src/gui/kernel/qguiapplication_p.h
View File

@ -187,11 +187,7 @@ public:
Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
static bool processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result);
#else
static bool processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result);
#endif
static bool sendQWindowEventToQPlatformWindow(QWindow *window, QEvent *event);

4
src/gui/kernel/qwindow.cpp
View File

@ -2653,11 +2653,7 @@ void QWindow::tabletEvent(QTabletEvent *ev)
Should return true only if the event was handled.
*/
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool QWindow::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
#else
bool QWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
#endif
{
Q_UNUSED(eventType);
Q_UNUSED(message);

4
src/gui/kernel/qwindow.h
View File

@ -374,11 +374,7 @@ protected:
#if QT_CONFIG(tabletevent)
virtual void tabletEvent(QTabletEvent *);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
virtual bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result);
#else
virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result);
#endif
QWindow(QWindowPrivate &dd, QWindow *parent);

4
src/gui/kernel/qwindowsysteminterface.cpp
View File

@ -896,11 +896,7 @@ QPlatformDropQtResponse QWindowSystemInterface::handleDrop(QWindow *window, cons
\note This function can only be called from the GUI thread.
*/
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result)
#else
bool QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result)
#endif
{
return QGuiApplicationPrivate::processNativeEvent(window, eventType, message, result);
}

4
src/gui/kernel/qwindowsysteminterface.h
View File

@ -244,11 +244,7 @@ public:
Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
#endif // QT_CONFIG(draganddrop)
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
static bool handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result);
#else
static bool handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result);
#endif
// Changes to the screen
static void handleScreenAdded(QPlatformScreen *screen, bool isPrimary = false);

10
src/gui/text/qfont.cpp
View File

@ -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.

3
src/gui/text/qfont.h
View File

@ -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();

14
src/gui/text/qtextlayout.cpp
View File

@ -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);

12
src/gui/text/qtextlayout.h
View File

@ -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();

6
tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
View File

@ -1020,13 +1020,7 @@ void tst_QGuiApplication::genericPluginsAndWindowSystemEvents()
QCoreApplication::postEvent(&testReceiver, new QEvent(QEvent::User));
QCOMPARE(testReceiver.customEvents, 0);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QStaticPlugin testPluginInfo(qt_plugin_instance, qt_plugin_query_metadata);
#else
QStaticPlugin testPluginInfo;
testPluginInfo.instance = qt_plugin_instance;
testPluginInfo.rawMetaData = qt_plugin_query_metadata;
#endif
qRegisterStaticPluginFunction(testPluginInfo);
int argc = 3;
char *argv[] = { const_cast<char*>(QTest::currentAppName()), const_cast<char*>("-plugin"), const_cast<char*>("testplugin") };

2
tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
View File

@ -1800,12 +1800,10 @@ void tst_QTextDocument::toHtml()
QCOMPARE(output, expectedOutput);
QDomDocument document;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QEXPECT_FAIL("charfmt-for-list-item",
"The attribute \"style\" is redefined in the generated HTML, which is not valid "
"according to XML standard. The new QDomDocument implementation follows the XML "
"standard.", Continue);
#endif
QVERIFY2(document.setContent(output), "Output was not valid XML");
}