summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-29 10:17:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-29 11:33:35 +0100
commit3eb588078e7f4d62053584a70f7600b19ec99a0f (patch)
tree432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/gui/image
parent7b8ab4204417844e72bb66696227a422f4ef3e2d (diff)
parent02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qimagereader.cpp5
-rw-r--r--src/gui/image/qimagewriter.cpp5
-rw-r--r--src/gui/image/qplatformpixmap.cpp2
3 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index dfdc3fdc2d..286169426e 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -1460,9 +1460,8 @@ void supportedImageHandlerMimeTypes(QFactoryLoader *loader,
\row \li SVG \li image/svg+xml \li Scalable Vector Graphics
\endtable
- Reading and writing SVG files is supported through Qt's
- \l{QtSvg Module}{SVG Module}. The \l{QtImageFormats Module}{Image Formats Module}
- provides support for additional image formats.
+ Reading and writing SVG files is supported through the \l{Qt SVG} module.
+ The \l{Qt Image Formats} module provides support for additional image formats.
Note that the QApplication instance must be created before this function is
called.
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 67b21e372e..9ce3a774ed 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -717,9 +717,8 @@ void supportedImageHandlerMimeTypes(QFactoryLoader *loader,
\row \li XPM \li image/x-xpixmap \li X11 Pixmap
\endtable
- Reading and writing SVG files is supported through Qt's
- \l{QtSvg Module}{SVG Module}. The \l{QtImageFormats Module}{Image Formats Module}
- provides support for additional image formats.
+ Reading and writing SVG files is supported through the \l{Qt SVG} module.
+ The \l{Qt Image Formats} module provides support for additional image formats.
Note that the QApplication instance must be created before this function is
called.
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index 1f40102cf0..54f0087bc2 100644
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -83,7 +83,7 @@ QPlatformPixmap::QPlatformPixmap(PixelType pixelType, int objectId)
QPlatformPixmap::~QPlatformPixmap()
{
// Sometimes the pixmap cleanup hooks will be called from derrived classes, which will
- // then set is_cached to false. For example, on X11 QtGui needs to delete the GLXPixmap
+ // then set is_cached to false. For example, on X11 Qt GUI needs to delete the GLXPixmap
// or EGL Pixmap Surface for a given pixmap _before_ the native X11 pixmap is deleted,
// otherwise some drivers will leak the GL surface. In this case, QX11PlatformPixmap will
// call the cleanup hooks itself before deleting the native pixmap and set is_cached to