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

small cleanups

Browse Source
This commit is contained in:
Lars Knoll 2011-05-04 10:34:40 +02:00
parent c418f5ce8d
commit b9798615b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qtexthtmlparser.cpp
View File

@ -1406,7 +1406,7 @@ void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDo
if (!url.isEmpty() && resourceProvider) { if (!url.isEmpty() && resourceProvider) {
QVariant val = resourceProvider->resource(QTextDocument::ImageResource, url); QVariant val = resourceProvider->resource(QTextDocument::ImageResource, url);
if (qApp->thread() != QThread::currentThread()) { if (QCoreApplication::instance()->thread() != QThread::currentThread()) {
// must use images in non-GUI threads // must use images in non-GUI threads
if (val.type() == QVariant::Image) { if (val.type() == QVariant::Image) {
QImage image = qvariant_cast<QImage>(val); QImage image = qvariant_cast<QImage>(val);

6
src/gui/text/qtextimagehandler.cpp
View File

@ -42,7 +42,7 @@
#include "qtextimagehandler_p.h" #include "qtextimagehandler_p.h"
#include <qapplication.h> #include <qcoreapplication.h>
#include <qtextformat.h> #include <qtextformat.h>
#include <qpainter.h> #include <qpainter.h>
#include <qdebug.h> #include <qdebug.h>
@ -210,7 +210,7 @@ QSizeF QTextImageHandler::intrinsicSize(QTextDocument *doc, int posInDocument, c
Q_UNUSED(posInDocument) Q_UNUSED(posInDocument)
const QTextImageFormat imageFormat = format.toImageFormat(); const QTextImageFormat imageFormat = format.toImageFormat();
if (qApp->thread() != QThread::currentThread()) if (QCoreApplication::instance()->thread() != QThread::currentThread())
return getImageSize(doc, imageFormat); return getImageSize(doc, imageFormat);
return getPixmapSize(doc, imageFormat); return getPixmapSize(doc, imageFormat);
} }
@ -220,7 +220,7 @@ void QTextImageHandler::drawObject(QPainter *p, const QRectF &rect, QTextDocumen
Q_UNUSED(posInDocument) Q_UNUSED(posInDocument)
const QTextImageFormat imageFormat = format.toImageFormat(); const QTextImageFormat imageFormat = format.toImageFormat();
if (qApp->thread() != QThread::currentThread()) { if (QCoreApplication::instance()->thread() != QThread::currentThread()) {
const QImage image = getImage(doc, imageFormat); const QImage image = getImage(doc, imageFormat);
p->drawImage(rect, image, image.rect()); p->drawImage(rect, image, image.rect());
} else { } else {