summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffectSamuel Rødal2009-07-282-258/+243
| |\ \ \ \ \ \
| | * | | | | | Added QPixmapBlurFilter with GL implementation.Samuel Rødal2009-06-302-0/+208
| * | | | | | | Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shadersRhys Weatherley2009-07-233-42/+51
| |\ \ \ \ \ \ \
| * | | | | | | | Add QPixmapBlurFilter for non-convolution blur effects.Rhys Weatherley2009-07-232-0/+263
* | | | | | | | | compile again with QExplicitlySharedDataPointerHarald Fernengel2009-08-211-1/+1
* | | | | | | | | More qpixmap*.cpp fixes for QExplicitlySharedDataPointer.Jason Barron2009-08-211-1/+1
* | | | | | | | | Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes.Jason Barron2009-08-204-18/+18
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-209-73/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use QExplicitlySharedDataPointer wherever possibleHarald Fernengel2009-08-209-73/+64
* | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-202-4/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Remove a few warnings when compiling Qt and unexport some functions.Thiago Macieira2009-08-202-4/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Changed names and URLs to reflect name change.axis2009-08-191-1/+1
* | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-1815-55/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-1711-21/+20
| * | | | | | | remove QT_RASTER_PAINTENGINE and QT_RASTER_IMAGEENGINE defines as they areGunnar Sletta2009-08-172-17/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix coverity warningsThierry Bastian2009-08-172-2/+2
| * | | | | | Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
| * | | | | | Doc: Fix links and silence qdoc warnings.Volker Hilsheimer2009-08-161-13/+15
| * | | | | | QVariant: added toFloat and toRealThierry Bastian2009-08-141-1/+1
* | | | | | | Fix incorrect logic in QPixmap::fromSymbianCFbsBitmap.Jason Barron2009-08-141-1/+4
* | | | | | | Partially revert oom safety fixesHarald Fernengel2009-08-141-18/+9
* | | | | | | Use QScopedPointer wherever possibleHarald Fernengel2009-08-133-53/+44
* | | | | | | Merge commit 'qt/master'Jason Barron2009-08-1363-125/+1163
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Eliminate last mentions of "Qt Software".Jason McDonald2009-08-122-2/+2
| * | | | | | Update contact URL in license headers.Jason McDonald2009-08-1262-62/+62
| * | | | | | Compile QtGui on Linux with no Gtk development package present.Friedemann Kleint2009-08-111-0/+4
| * | | | | | Make compile.Bill King2009-08-112-0/+2
| * | | | | | Doc: Fix links and qdoc warnings.Volker Hilsheimer2009-08-101-3/+3
| * | | | | | Introducing icon theme supportJens Bache-Wiig2009-08-106-66/+1095
| * | | | | | Compile fix with namespaceshjk2009-08-101-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Update license headers according to commit 858c70f768e.axis2009-08-061-3/+3
* | | | | | Replaced $MODULE$ with hardcoded module names.axis2009-08-061-1/+1
* | | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-065-8/+8
* | | | | | Merge commit 'origin/master'Jason Barron2009-08-049-22/+36
|\ \ \ \ \ \
| * | | | | | Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-041-1/+0
| * | | | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-039-21/+36
* | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-049-44/+239
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-08-031-0/+1
| * | | | | | Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-308-44/+238
| |\ \ \ \ \ \
| | * | | | | | Refactor texture_from_pixmap to not re-create the gl surface each bindTom Cooksey2009-07-291-0/+1
| | * | | | | | Move uninit & readonly into a flags member of QX11PixmapDataTom Cooksey2009-07-293-16/+23
| | * | | | | | Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-285-28/+214
* | | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-4/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Doc: Re-apply relevant change from 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2Volker Hilsheimer2009-07-281-4/+11
| |/ / / / / /
* | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Doc: Obsolete QMatrix and QPainter APIs using it.Volker Hilsheimer2009-07-271-1/+2
* | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-285-98/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Doc: Replace links to obsolete APIs.Volker Hilsheimer2009-07-251-3/+2
| * | | | | | Revert "Doc: Clarified that the format used in QImage::fromData() is the image"Volker Hilsheimer2009-07-251-31/+27
| * | | | | | Doc: \em is not a qdoc command, \e is correctVolker Hilsheimer2009-07-251-2/+2