diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
tree | 563f4f8e64e416774ea2b1599b896b589385168c /src/gui/image | |
parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qgifhandler.pri | 1 | ||||
-rw-r--r-- | src/gui/image/qicon.cpp | 7 | ||||
-rw-r--r-- | src/gui/image/qimage.cpp | 9 | ||||
-rw-r--r-- | src/gui/image/qjpeghandler.pri | 1 | ||||
-rw-r--r-- | src/gui/image/qpixmapcache.cpp | 14 | ||||
-rw-r--r-- | src/gui/image/qpnghandler.pri | 1 |
6 files changed, 28 insertions, 5 deletions
diff --git a/src/gui/image/qgifhandler.pri b/src/gui/image/qgifhandler.pri index 6eb0751372..ec33101451 100644 --- a/src/gui/image/qgifhandler.pri +++ b/src/gui/image/qgifhandler.pri @@ -1,4 +1,3 @@ # common to plugin and built-in forms -INCLUDEPATH *= $$PWD HEADERS += $$PWD/qgifhandler_p.h SOURCES += $$PWD/qgifhandler.cpp diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 6b506580ea..7a59adffb8 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -629,6 +629,13 @@ QIcon::QIcon(const QIcon &other) } /*! + \fn QIcon::QIcon(QIcon &&other) + + Move-constructs a QIcon instance, making it point to the same object + that \a other was pointing to. +*/ + +/*! Constructs an icon from the file with the given \a fileName. The file will be loaded on demand. diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index b8606a92b4..aea6fc133f 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -572,12 +572,13 @@ bool QImageData::checkForAlphaPixels() const \endtable + \target qimage-legalese \section1 Legal Information For smooth scaling, the transformed() functions use code based on smooth scaling algorithm by Daniel M. Duley. - \legalese + \badcode Copyright (C) 2004, 2005 Daniel M. Duley Redistribution and use in source and binary forms, with or without @@ -600,7 +601,7 @@ bool QImageData::checkForAlphaPixels() const THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - \endlegalese + \endcode \sa QImageReader, QImageWriter, QPixmap, QSvgRenderer, {Image Composition Example}, {Image Viewer Example}, {Scribble Example}, {Pixelator Example} @@ -4359,6 +4360,10 @@ int QImage::bitPlaneCount() const return bpc; } +/*! + Returns a smoothly scaled copy of the image. The returned image has a size + of width \a w by height \a h pixels. +*/ QImage QImage::smoothScaled(int w, int h) const { QImage src = *this; switch (src.format()) { diff --git a/src/gui/image/qjpeghandler.pri b/src/gui/image/qjpeghandler.pri index c8de33d8b4..de40c6742e 100644 --- a/src/gui/image/qjpeghandler.pri +++ b/src/gui/image/qjpeghandler.pri @@ -1,5 +1,4 @@ # common to plugin and built-in forms -INCLUDEPATH *= $$PWD HEADERS += $$PWD/qjpeghandler_p.h SOURCES += $$PWD/qjpeghandler.cpp contains(QT_CONFIG, system-jpeg) { diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 0fefa1f7ea..71a79745e8 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -659,4 +659,18 @@ int QPixmapCache::totalUsed() return (pm_cache()->totalCost()+1023) / 1024; } +/*! + \fn QPixmapCache::KeyData::KeyData() + + \internal +*/ +/*! + \fn QPixmapCache::KeyData::KeyData(const KeyData &other) + \internal +*/ +/*! + \fn QPixmapCache::KeyData::~KeyData() + + \internal +*/ QT_END_NAMESPACE diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri index aca7e2c568..9ab175d628 100644 --- a/src/gui/image/qpnghandler.pri +++ b/src/gui/image/qpnghandler.pri @@ -1,4 +1,3 @@ -INCLUDEPATH *= $$PWD HEADERS += $$PWD/qpnghandler_p.h SOURCES += $$PWD/qpnghandler.cpp contains(QT_CONFIG, system-png) { |