diff options
Diffstat (limited to 'src/gui')
58 files changed, 165 insertions, 17 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index d0d46942fb..32d0e6ca91 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -54,6 +54,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qloggingcategory.h> #include <QtCore/qmetaobject.h> +#include <QtCore/private/qmetaobject_p.h> #include <QtCore/qhash.h> #include <private/qfactoryloader_p.h> @@ -680,6 +681,25 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) // Create a QAccessibleInterface for the object class. Start by the most // derived class and walk up the class hierarchy. const QMetaObject *mo = object->metaObject(); + const auto *objectPriv = QObjectPrivate::get(object); + /* + We do not want to cache each and every QML metaobject (Button_QMLTYPE_124, + Button_QMLTYPE_125, etc.). Those dynamic metaobjects shouldn't have an + accessible interface in any case. Instead, we start the whole checking + with the first non-dynamic meta-object. To avoid potential regressions + in other areas of Qt that also use dynamic metaobjects, we only do this + for objects that are QML-related (approximated by checking whether they + have ddata set). + */ + const bool qmlRelated = !objectPriv->isDeletingChildren && + objectPriv->declarativeData; + while (qmlRelated && mo) { + auto mop = QMetaObjectPrivate::get(mo); + if (!mop || !(mop->flags & DynamicMetaObject)) + break; + + mo = mo->superClass(); + }; while (mo) { const QString cn = QLatin1String(mo->className()); @@ -695,14 +715,15 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) // Find a QAccessiblePlugin (factory) for the class name. If there's // no entry in the cache try to create it using the plugin loader. if (!qAccessiblePlugins()->contains(cn)) { + QAccessiblePlugin *factory = nullptr; // 0 means "no plugin found". This is cached as well. const int index = loader()->indexOf(cn); - if (index != -1) { - QAccessiblePlugin *factory = qobject_cast<QAccessiblePlugin *>(loader()->instance(index)); - qAccessiblePlugins()->insert(cn, factory); - } + if (index != -1) + factory = qobject_cast<QAccessiblePlugin *>(loader()->instance(index)); + qAccessiblePlugins()->insert(cn, factory); } // At this point the cache should contain a valid factory pointer or 0: + Q_ASSERT(qAccessiblePlugins()->contains(cn)); QAccessiblePlugin *factory = qAccessiblePlugins()->value(cn); if (factory) { QAccessibleInterface *result = factory->create(cn, object); diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp index c6a417e063..7c8a415493 100644 --- a/src/gui/accessible/qaccessiblebridge.cpp +++ b/src/gui/accessible/qaccessiblebridge.cpp @@ -138,4 +138,6 @@ QAccessibleBridgePlugin::~QAccessibleBridgePlugin() QT_END_NAMESPACE +#include "moc_qaccessiblebridge.cpp" + #endif // QT_NO_ACCESSIBILITY diff --git a/src/gui/accessible/qaccessiblecache.cpp b/src/gui/accessible/qaccessiblecache.cpp index 20376a54c4..28c797a0f1 100644 --- a/src/gui/accessible/qaccessiblecache.cpp +++ b/src/gui/accessible/qaccessiblecache.cpp @@ -159,4 +159,6 @@ void QAccessibleCache::deleteInterface(QAccessible::Id id, QObject *obj) QT_END_NAMESPACE +#include "moc_qaccessiblecache_p.cpp" + #endif diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp index 27497858b5..709e0f3daa 100644 --- a/src/gui/accessible/qaccessibleplugin.cpp +++ b/src/gui/accessible/qaccessibleplugin.cpp @@ -89,4 +89,6 @@ QAccessiblePlugin::~QAccessiblePlugin() QT_END_NAMESPACE +#include "moc_qaccessibleplugin.cpp" + #endif // QT_NO_ACCESSIBILITY diff --git a/src/gui/image/qiconengineplugin.cpp b/src/gui/image/qiconengineplugin.cpp index ca80ee50a7..74e9fcab6c 100644 --- a/src/gui/image/qiconengineplugin.cpp +++ b/src/gui/image/qiconengineplugin.cpp @@ -97,3 +97,5 @@ QIconEnginePlugin::~QIconEnginePlugin() QT_END_NAMESPACE + +#include "moc_qiconengineplugin.cpp" diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 7152ac1607..53bb3beb10 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4975,7 +4975,8 @@ void QImage::convertToColorSpace(const QColorSpace &colorSpace) qWarning() << "QImage::convertToColorSpace: Output colorspace is not valid"; return; } - detach(); + if (d->colorSpace == colorSpace) + return; applyColorTransform(d->colorSpace.transformationToColorSpace(colorSpace)); d->colorSpace = colorSpace; } @@ -5017,6 +5018,14 @@ QColorSpace QImage::colorSpace() const */ void QImage::applyColorTransform(const QColorTransform &transform) { + detach(); + if (!d) + return; + if (pixelFormat().colorModel() == QPixelFormat::Indexed) { + for (int i = 0; i < d->colortable.size(); ++i) + d->colortable[i] = transform.map(d->colortable[i]); + return; + } QImage::Format oldFormat = format(); if (depth() > 32) { if (format() != QImage::Format_RGBX64 && format() != QImage::Format_RGBA64 @@ -5052,14 +5061,14 @@ void QImage::applyColorTransform(const QColorTransform &transform) if (depth() > 32) { transformSegment = [&](int yStart, int yEnd) { for (int y = yStart; y < yEnd; ++y) { - QRgba64 *scanline = reinterpret_cast<QRgba64 *>(scanLine(y)); + QRgba64 *scanline = reinterpret_cast<QRgba64 *>(d->data + y * d->bytes_per_line); transform.d->apply(scanline, scanline, width(), flags); } }; } else { transformSegment = [&](int yStart, int yEnd) { for (int y = yStart; y < yEnd; ++y) { - QRgb *scanline = reinterpret_cast<QRgb *>(scanLine(y)); + QRgb *scanline = reinterpret_cast<QRgb *>(d->data + y * d->bytes_per_line); transform.d->apply(scanline, scanline, width(), flags); } }; @@ -5648,3 +5657,5 @@ QMap<QString, QString> qt_getImageTextFromDescription(const QString &description } QT_END_NAMESPACE + +#include "moc_qimage.cpp" diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp index 0c9083a16e..1be0dfff78 100644 --- a/src/gui/image/qimageiohandler.cpp +++ b/src/gui/image/qimageiohandler.cpp @@ -618,3 +618,5 @@ QImageIOPlugin::~QImageIOPlugin() #endif // QT_NO_IMAGEFORMATPLUGIN QT_END_NAMESPACE + +#include "moc_qimageiohandler.cpp" diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index db22ef2486..fc364e3acd 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -610,4 +610,6 @@ void QClipboard::emitChanged(Mode mode) QT_END_NAMESPACE +#include "moc_qclipboard.cpp" + #endif // QT_NO_CLIPBOARD diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index fe766c900e..ecf8b3f4ce 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -123,3 +123,5 @@ Qt::DropAction QDragManager::drag(QDrag *o) } QT_END_NAMESPACE + +#include "moc_qdnd_p.cpp" diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index 3712eace15..ee4b816e72 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -423,3 +423,5 @@ void QDrag::cancel() */ QT_END_NAMESPACE + +#include "moc_qdrag.cpp" diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index a6da24e4b2..542f3e3217 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -5320,3 +5320,5 @@ uint qHash(QPointingDeviceUniqueId key, uint seed) noexcept } QT_END_NAMESPACE + +#include "moc_qevent.cpp" diff --git a/src/gui/kernel/qgenericplugin.cpp b/src/gui/kernel/qgenericplugin.cpp index a53b60b008..7ecdc72d97 100644 --- a/src/gui/kernel/qgenericplugin.cpp +++ b/src/gui/kernel/qgenericplugin.cpp @@ -94,3 +94,5 @@ QGenericPlugin::~QGenericPlugin() */ QT_END_NAMESPACE + +#include "moc_qgenericplugin.cpp" diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp index 9bbf2773a9..85ff58c14c 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -726,3 +726,5 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *w #endif //QT_NO_HIGHDPISCALING QT_END_NAMESPACE + +#include "moc_qhighdpiscaling_p.cpp" diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp index 11442407e1..13e32a08f9 100644 --- a/src/gui/kernel/qinputdevicemanager.cpp +++ b/src/gui/kernel/qinputdevicemanager.cpp @@ -116,3 +116,5 @@ void QInputDeviceManager::setKeyboardModifiers(Qt::KeyboardModifiers mods) } QT_END_NAMESPACE + +#include "moc_qinputdevicemanager_p.cpp" diff --git a/src/gui/kernel/qinternalmimedata.cpp b/src/gui/kernel/qinternalmimedata.cpp index d5cdc743ee..a2b47879cc 100644 --- a/src/gui/kernel/qinternalmimedata.cpp +++ b/src/gui/kernel/qinternalmimedata.cpp @@ -233,3 +233,5 @@ QByteArray QInternalMimeData::renderDataHelper(const QString &mimeType, const QM } QT_END_NAMESPACE + +#include "moc_qinternalmimedata_p.cpp" diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp index 274574f561..38180105e0 100644 --- a/src/gui/kernel/qkeymapper.cpp +++ b/src/gui/kernel/qkeymapper.cpp @@ -147,3 +147,5 @@ QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent *e) } QT_END_NAMESPACE + +#include "moc_qkeymapper_p.cpp" diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index a75b8ef920..23be5e1ac0 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1693,3 +1693,5 @@ QDebug operator<<(QDebug dbg, const QKeySequence &p) */ QT_END_NAMESPACE + +#include "moc_qkeysequence.cpp" diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp index c74fe0b3a1..ae7bc33291 100644 --- a/src/gui/kernel/qoffscreensurface.cpp +++ b/src/gui/kernel/qoffscreensurface.cpp @@ -435,3 +435,5 @@ QPlatformSurface *QOffscreenSurface::surfaceHandle() const } QT_END_NAMESPACE + +#include "moc_qoffscreensurface.cpp" diff --git a/src/gui/kernel/qpaintdevicewindow.cpp b/src/gui/kernel/qpaintdevicewindow.cpp index 4f45fc5fde..0ba52cc7ab 100644 --- a/src/gui/kernel/qpaintdevicewindow.cpp +++ b/src/gui/kernel/qpaintdevicewindow.cpp @@ -223,3 +223,5 @@ QPaintEngine *QPaintDeviceWindow::paintEngine() const } QT_END_NAMESPACE + +#include "moc_qpaintdevicewindow.cpp" diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 4654e52c72..a192b7aef4 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -1234,3 +1234,5 @@ QDebug operator<<(QDebug dbg, const QPalette &p) #endif QT_END_NAMESPACE + +#include "moc_qpalette.cpp" diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 33cd004234..4ca5421bc1 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -1012,3 +1012,5 @@ void QPlatformMessageDialogHelper::setOptions(const QSharedPointer<QMessageDialo } QT_END_NAMESPACE + +#include "moc_qplatformdialoghelper.cpp" diff --git a/src/gui/kernel/qplatformgraphicsbuffer.cpp b/src/gui/kernel/qplatformgraphicsbuffer.cpp index 73ec033e19..371fd543be 100644 --- a/src/gui/kernel/qplatformgraphicsbuffer.cpp +++ b/src/gui/kernel/qplatformgraphicsbuffer.cpp @@ -274,3 +274,5 @@ QPlatformGraphicsBuffer::Origin QPlatformGraphicsBuffer::origin() const */ QT_END_NAMESPACE + +#include "moc_qplatformgraphicsbuffer.cpp" diff --git a/src/gui/kernel/qplatforminputcontext.cpp b/src/gui/kernel/qplatforminputcontext.cpp index 9771e6ba11..5b6b2d11d8 100644 --- a/src/gui/kernel/qplatforminputcontext.cpp +++ b/src/gui/kernel/qplatforminputcontext.cpp @@ -298,3 +298,5 @@ void QPlatformInputContext::setSelectionOnFocusObject(const QPointF &anchorPos, } QT_END_NAMESPACE + +#include "moc_qplatforminputcontext.cpp" diff --git a/src/gui/kernel/qplatforminputcontextplugin.cpp b/src/gui/kernel/qplatforminputcontextplugin.cpp index 53d56dbb48..48be855743 100644 --- a/src/gui/kernel/qplatforminputcontextplugin.cpp +++ b/src/gui/kernel/qplatforminputcontextplugin.cpp @@ -51,3 +51,5 @@ QPlatformInputContextPlugin::~QPlatformInputContextPlugin() } QT_END_NAMESPACE + +#include "moc_qplatforminputcontextplugin_p.cpp" diff --git a/src/gui/kernel/qplatformintegrationplugin.cpp b/src/gui/kernel/qplatformintegrationplugin.cpp index b100eacbb5..fd4abcd791 100644 --- a/src/gui/kernel/qplatformintegrationplugin.cpp +++ b/src/gui/kernel/qplatformintegrationplugin.cpp @@ -65,3 +65,5 @@ QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, con } QT_END_NAMESPACE + +#include "moc_qplatformintegrationplugin.cpp" diff --git a/src/gui/kernel/qplatformmenu.cpp b/src/gui/kernel/qplatformmenu.cpp index 0d76f2039d..5d7b3c1bab 100644 --- a/src/gui/kernel/qplatformmenu.cpp +++ b/src/gui/kernel/qplatformmenu.cpp @@ -92,3 +92,5 @@ QPlatformMenu *QPlatformMenuBar::createMenu() const } QT_END_NAMESPACE + +#include "moc_qplatformmenu.cpp" diff --git a/src/gui/kernel/qplatformnativeinterface.cpp b/src/gui/kernel/qplatformnativeinterface.cpp index 8c9e73fbc2..560ff24dfd 100644 --- a/src/gui/kernel/qplatformnativeinterface.cpp +++ b/src/gui/kernel/qplatformnativeinterface.cpp @@ -175,3 +175,5 @@ void QPlatformNativeInterface::setWindowProperty(QPlatformWindow *window, const } QT_END_NAMESPACE + +#include "moc_qplatformnativeinterface.cpp" diff --git a/src/gui/kernel/qplatformsharedgraphicscache.cpp b/src/gui/kernel/qplatformsharedgraphicscache.cpp index f6c4e3309e..f5e86c341d 100644 --- a/src/gui/kernel/qplatformsharedgraphicscache.cpp +++ b/src/gui/kernel/qplatformsharedgraphicscache.cpp @@ -292,3 +292,5 @@ QT_BEGIN_NAMESPACE */ QT_END_NAMESPACE + +#include "moc_qplatformsharedgraphicscache.cpp" diff --git a/src/gui/kernel/qplatformthemeplugin.cpp b/src/gui/kernel/qplatformthemeplugin.cpp index c09476bee5..59c0731e8d 100644 --- a/src/gui/kernel/qplatformthemeplugin.cpp +++ b/src/gui/kernel/qplatformthemeplugin.cpp @@ -60,3 +60,5 @@ QPlatformThemePlugin::~QPlatformThemePlugin() } QT_END_NAMESPACE + +#include "moc_qplatformthemeplugin.cpp" diff --git a/src/gui/kernel/qrasterwindow.cpp b/src/gui/kernel/qrasterwindow.cpp index 70d87347c3..c45f9a4e11 100644 --- a/src/gui/kernel/qrasterwindow.cpp +++ b/src/gui/kernel/qrasterwindow.cpp @@ -139,3 +139,5 @@ QPaintDevice *QRasterWindow::redirected(QPoint *) const } QT_END_NAMESPACE + +#include "moc_qrasterwindow.cpp" diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 8e0eb35116..990272b0c2 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -849,3 +849,5 @@ Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen) #endif // !QT_NO_DEBUG_STREAM QT_END_NAMESPACE + +#include "moc_qscreen.cpp" diff --git a/src/gui/kernel/qsessionmanager.cpp b/src/gui/kernel/qsessionmanager.cpp index 8747e02719..e1066de451 100644 --- a/src/gui/kernel/qsessionmanager.cpp +++ b/src/gui/kernel/qsessionmanager.cpp @@ -423,4 +423,6 @@ void QSessionManager::requestPhase2() QT_END_NAMESPACE +#include "moc_qsessionmanager.cpp" + #endif // QT_NO_SESSIONMANAGER diff --git a/src/gui/kernel/qshapedpixmapdndwindow.cpp b/src/gui/kernel/qshapedpixmapdndwindow.cpp index 1a85a5e853..bb0d8e4ee7 100644 --- a/src/gui/kernel/qshapedpixmapdndwindow.cpp +++ b/src/gui/kernel/qshapedpixmapdndwindow.cpp @@ -112,3 +112,5 @@ void QShapedPixmapWindow::updateGeometry(const QPoint &pos) } QT_END_NAMESPACE + +#include "moc_qshapedpixmapdndwindow_p.cpp" diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp index 7b3c70c51b..288bdf1b3c 100644 --- a/src/gui/kernel/qstylehints.cpp +++ b/src/gui/kernel/qstylehints.cpp @@ -621,3 +621,5 @@ int QStyleHints::mouseQuickSelectionThreshold() const } QT_END_NAMESPACE + +#include "moc_qstylehints.cpp" diff --git a/src/gui/kernel/qsurface.cpp b/src/gui/kernel/qsurface.cpp index 85c576b21c..e76b618c65 100644 --- a/src/gui/kernel/qsurface.cpp +++ b/src/gui/kernel/qsurface.cpp @@ -160,3 +160,5 @@ QSurface::SurfaceClass QSurface::surfaceClass() const QT_END_NAMESPACE +#include "moc_qsurface.cpp" + diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index 6c04abc293..461f6776ce 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -908,3 +908,5 @@ QDebug operator<<(QDebug dbg, const QSurfaceFormat &f) #endif QT_END_NAMESPACE + +#include "moc_qsurfaceformat.cpp" diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 703c492a6b..ebce163ed3 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -249,8 +249,18 @@ void QBackingStore::flush(const QRegion ®ion, QWindow *window, const QPoint & Q_ASSERT(window == topLevelWindow || topLevelWindow->isAncestorOf(window, QWindow::ExcludeTransients)); - handle()->flush(window, QHighDpi::toNativeLocalRegion(region, window), - QHighDpi::toNativeLocalPosition(offset, window)); + QRegion nativeRegion = QHighDpi::toNativeLocalRegion(region, window); + QPoint nativeOffset; + if (!offset.isNull()) { + nativeOffset = QHighDpi::toNativeLocalPosition(offset, window); + // Under fractional DPR, rounding of region and offset may accumulate to an off-by-one + QPoint topLeft = region.boundingRect().topLeft() + offset; + QPoint nativeTopLeft = QHighDpi::toNativeLocalPosition(topLeft, window); + QPoint diff = nativeTopLeft - (nativeRegion.boundingRect().topLeft() + nativeOffset); + Q_ASSERT(qMax(qAbs(diff.x()), qAbs(diff.y())) <= 1); + nativeRegion.translate(diff); + } + handle()->flush(window, nativeRegion, nativeOffset); } /*! diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 9e5605dd48..08d7055b82 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -2638,3 +2638,5 @@ void QConicalGradient::setAngle(qreal angle) #undef Q_DUMMY_ACCESSOR QT_END_NAMESPACE + +#include "moc_qbrush.cpp" diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp index 5977f8f8c5..dd30c64640 100644 --- a/src/gui/painting/qcolorspace.cpp +++ b/src/gui/painting/qcolorspace.cpp @@ -848,3 +848,5 @@ QDebug operator<<(QDebug dbg, const QColorSpace &colorSpace) #endif QT_END_NAMESPACE + +#include "moc_qcolorspace.cpp" diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 826a7ab27f..fdb7f331aa 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -8588,3 +8588,5 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat } QT_END_NAMESPACE + +#include "moc_qpainter.cpp" diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp index cf30ea496c..ae140f31b5 100644 --- a/src/gui/painting/qpdfwriter.cpp +++ b/src/gui/painting/qpdfwriter.cpp @@ -489,4 +489,6 @@ QT_WARNING_POP QT_END_NAMESPACE +#include "moc_qpdfwriter.cpp" + #endif // QT_NO_PDF diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp index c092a7153f..9c9b053b2b 100644 --- a/src/gui/painting/qplatformbackingstore.cpp +++ b/src/gui/painting/qplatformbackingstore.cpp @@ -751,3 +751,5 @@ bool QPlatformBackingStore::scroll(const QRegion &area, int dx, int dy) } QT_END_NAMESPACE + +#include "moc_qplatformbackingstore.cpp" diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp index 8528f59844..7aa3aa7453 100644 --- a/src/gui/text/qabstracttextdocumentlayout.cpp +++ b/src/gui/text/qabstracttextdocumentlayout.cpp @@ -436,7 +436,8 @@ void QAbstractTextDocumentLayout::registerHandler(int objectType, QObject *compo if (!iface) return; // ### print error message on terminal? - connect(component, SIGNAL(destroyed(QObject*)), this, SLOT(_q_handlerDestroyed(QObject*))); + QObjectPrivate::connect(component, &QObject::destroyed, d, + &QAbstractTextDocumentLayoutPrivate::_q_handlerDestroyed); QTextObjectHandler h; h.iface = iface; @@ -457,7 +458,8 @@ void QAbstractTextDocumentLayout::unregisterHandler(int objectType, QObject *com const auto it = d->handlers.constFind(objectType); if (it != d->handlers.cend() && (!component || component == it->component)) { if (component) - disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(_q_handlerDestroyed(QObject*))); + QObjectPrivate::disconnect(component, &QObject::destroyed, d, + &QAbstractTextDocumentLayoutPrivate::_q_handlerDestroyed); d->handlers.erase(it); } } diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 397dcd37d4..1e97ba3785 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -129,7 +129,6 @@ private: friend class QTextEngine; friend class QTextLayout; friend class QTextLine; - Q_PRIVATE_SLOT(d_func(), void _q_handlerDestroyed(QObject *obj)) Q_PRIVATE_SLOT(d_func(), int _q_dynamicPageCountSlot()) Q_PRIVATE_SLOT(d_func(), QSizeF _q_dynamicDocumentSizeSlot()) }; diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 3d044edd5a..9f16af0222 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -3320,3 +3320,5 @@ QDebug operator<<(QDebug stream, const QFont &font) #endif QT_END_NAMESPACE + +#include "moc_qfont.cpp" diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index a657a8c516..2011f935a9 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -2938,3 +2938,5 @@ Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script QT_END_NAMESPACE +#include "moc_qfontdatabase.cpp" + diff --git a/src/gui/text/qinputcontrol.cpp b/src/gui/text/qinputcontrol.cpp index 80d5e6af4e..8c05346730 100644 --- a/src/gui/text/qinputcontrol.cpp +++ b/src/gui/text/qinputcontrol.cpp @@ -140,3 +140,5 @@ bool QInputControl::isCommonTextEditShortcut(const QKeyEvent *ke) } QT_END_NAMESPACE + +#include "moc_qinputcontrol_p.cpp" diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index bb4390bca0..b75904e885 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -3499,3 +3499,5 @@ QTextDocumentPrivate *QTextDocument::docHandle() const */ QT_END_NAMESPACE + +#include "moc_qtextdocument.cpp" diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 4e5ee41e24..560a0a1c5f 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -3929,3 +3929,5 @@ QDebug operator<<(QDebug dbg, const QTextFormat &f) #endif QT_END_NAMESPACE + +#include "moc_qtextformat.cpp" diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index 053be89959..e650984c63 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -244,3 +244,5 @@ void QTextImageHandler::drawObject(QPainter *p, const QRectF &rect, QTextDocumen } QT_END_NAMESPACE + +#include "moc_qtextimagehandler_p.cpp" diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 26ac37b016..d4f0a5efdc 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1336,13 +1336,13 @@ void QTextLayout::drawCursor(QPainter *p, const QPointF &pos, int cursorPosition bool rightToLeft = d->isRightToLeft(); if (itm >= 0) { const QScriptItem &si = d->layoutData->items.at(itm); - if (si.ascent > 0) + if (si.ascent >= 0) base = si.ascent; - if (si.descent > 0) + if (si.descent >= 0) descent = si.descent; rightToLeft = si.analysis.bidiLevel % 2; } - qreal y = position.y() + (sl.y + sl.base() - base).toReal(); + qreal y = position.y() + (sl.y + sl.base() + sl.descent - base - descent).toReal(); bool toggleAntialiasing = !(p->renderHints() & QPainter::Antialiasing) && (p->transform().type() > QTransform::TxTranslate); if (toggleAntialiasing) diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp index 5857afa048..523c22ff87 100644 --- a/src/gui/text/qtextlist.cpp +++ b/src/gui/text/qtextlist.cpp @@ -320,3 +320,5 @@ void QTextList::add(const QTextBlock &block) } QT_END_NAMESPACE + +#include "moc_qtextlist.cpp" diff --git a/src/gui/text/qtextmarkdownimporter.cpp b/src/gui/text/qtextmarkdownimporter.cpp index cff4f12b5d..7296a6fe41 100644 --- a/src/gui/text/qtextmarkdownimporter.cpp +++ b/src/gui/text/qtextmarkdownimporter.cpp @@ -608,6 +608,9 @@ void QTextMarkdownImporter::insertBlock() if (m_doc->isEmpty()) { m_cursor->setBlockFormat(blockFormat); m_cursor->setCharFormat(charFormat); + } else if (m_listItem) { + m_cursor->insertBlock(blockFormat, QTextCharFormat()); + m_cursor->setCharFormat(charFormat); } else { m_cursor->insertBlock(blockFormat, charFormat); } diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 77dcae0dc8..2d307ab30e 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1863,3 +1863,5 @@ QString QTextFragment::text() const } QT_END_NAMESPACE + +#include "moc_qtextobject.cpp" diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index 125b97a382..0b656ce8a1 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -1335,3 +1335,5 @@ void QTextTable::setFormat(const QTextTableFormat &format) */ QT_END_NAMESPACE + +#include "moc_qtexttable.cpp" diff --git a/src/gui/util/qlayoutpolicy.cpp b/src/gui/util/qlayoutpolicy.cpp index 507df44a45..063a220f94 100644 --- a/src/gui/util/qlayoutpolicy.cpp +++ b/src/gui/util/qlayoutpolicy.cpp @@ -133,3 +133,5 @@ QDebug operator<<(QDebug dbg, const QLayoutPolicy &p) #endif QT_END_NAMESPACE + +#include "moc_qlayoutpolicy_p.cpp" diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index 70ed6cca3d..ed2b9e4367 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -500,7 +500,7 @@ void QIntValidator::setRange(int bottom, int top) \brief the validator's lowest acceptable value By default, this property's value is derived from the lowest signed - integer available (typically -2147483647). + integer available (-2147483648). \sa setRange() */ @@ -514,7 +514,7 @@ void QIntValidator::setBottom(int bottom) \brief the validator's highest acceptable value By default, this property's value is derived from the highest signed - integer available (typically 2147483647). + integer available (2147483647). \sa setRange() */ @@ -1095,4 +1095,6 @@ void QRegularExpressionValidatorPrivate::setRegularExpression(const QRegularExpr QT_END_NAMESPACE +#include "moc_qvalidator.cpp" + #endif // QT_NO_VALIDATOR diff --git a/src/gui/vulkan/qvulkanwindow.cpp b/src/gui/vulkan/qvulkanwindow.cpp index 14944d47f8..4a67956724 100644 --- a/src/gui/vulkan/qvulkanwindow.cpp +++ b/src/gui/vulkan/qvulkanwindow.cpp @@ -2752,3 +2752,5 @@ QMatrix4x4 QVulkanWindow::clipCorrectionMatrix() } QT_END_NAMESPACE + +#include "moc_qvulkanwindow.cpp" |