diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 13:29:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 13:29:05 (GMT) |
| commit | 7d5877d245e4740eaebfc963dbf46ec8dfb246ca (patch) | |
| tree | 0e02eb14e3322003c848d6b3091226c27f2cb574 /src/gui/text/qtextimagehandler.cpp | |
| parent | e8979d11428da7b705f295afd432b45d4d8dffcc (diff) | |
| parent | 90bc27ebe4dc59c3966ba9b3b18fa209e24afd7d (diff) | |
| download | Qt-7d5877d245e4740eaebfc963dbf46ec8dfb246ca.zip Qt-7d5877d245e4740eaebfc963dbf46ec8dfb246ca.tar.gz Qt-7d5877d245e4740eaebfc963dbf46ec8dfb246ca.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fixed compilation of qpixmap_raster.cpp
Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Really avoid compiler warnings on Windows
Diffstat (limited to 'src/gui/text/qtextimagehandler.cpp')
| -rw-r--r-- | src/gui/text/qtextimagehandler.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index a6d085a..bbff79c 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -123,7 +123,6 @@ static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format) qreal scale = 1.0; QPaintDevice *pdev = doc->documentLayout()->paintDevice(); if (pdev) { - Q_GUI_EXPORT extern int qt_defaultDpi(); if (pm.isNull()) pm = getPixmap(doc, format); if (!pm.isNull()) @@ -191,7 +190,6 @@ static QSize getImageSize(QTextDocument *doc, const QTextImageFormat &format) qreal scale = 1.0; QPaintDevice *pdev = doc->documentLayout()->paintDevice(); if (pdev) { - extern int qt_defaultDpi(); if (image.isNull()) image = getImage(doc, format); if (!image.isNull()) |