summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Collapse)AuthorAgeFilesLines
* Fix warnings on MSVCThierry Bastian2010-03-031-2/+2
|
* Make bindTextureFromNativePixmap use new QEgl APIsTom Cooksey2010-03-022-6/+7
| | | | | | | The old qt_chooseEGLConfigForPixmap & qt_createEGLSurfaceForPixmap code will remain until QX11GLPixmapData can be re-written properly. Reviewed-By: TrustMe
* Move QGLWidget::setContext logic into QEgl & QGLContextTom Cooksey2010-03-021-0/+1
| | | | | | | | | | | | | | | | QEgl::createSurface() on X11 will now check to see if the device's X11 Visual is compatible with the EGLConfig passed in. If it is not compatible, the function will re-create the QPaintDevice's native drawable with a different Visual (one which is compatable with the EGLConfig). This represented the bulk of the QGLWidget::setContext method which is now much simpler. As a consequense of this change, QWidgets with graphicssystem opengl will behave much more like QGLWidget as most of the code is re-used. So things like WA_TranslucentBackground should now work with opengl graphicssystem too. Reviewed-By: TrustMe
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-1/+1
|\ | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * Fixed translucent window rendering on 16 bit X11.Samuel Rødal2010-02-241-1/+1
| | | | | | | | | | | | | | | | Don't assume format is the same as systemFormat() in the QNativeImage constructor, for translucent windows it's always ARGB32_Premultiplied, and the depth of the window is always 32 bit. Reviewed-by: Trond
* | Add private qt_draw_glyphs() APIEskil Abrahamsen Blomfeldt2010-02-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some use cases where you use an external font engine and want to use Qt's font engine for painting, you might need a function which will give you direct access to the underlying font. A generic API for this requires a lot of API changes, so in the meantime, we implement an internal, specialized API to support the use cases where it is required. The API is considered internal and experimental, and not guaranteed to be stable or even exist across releases. This is API which provides several fun ways to shoot yourself in the foot, but if used properly, it will allow you to paint glyph ids at precalculated positions. Task-number: QTBUG-7844 Reviewed-by: Trond
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-151-1/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * \ \ Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-153-13/+46
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-158-132/+156
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp
| * | | | | Update license doc and .pri file for libpng 1.4.0aavit2010-02-151-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-173-8/+25
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | | Fix several bugs with GL texture cacheTom Cooksey2010-02-122-4/+20
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trond Autotest: tst_QGL::qglContextDefaultBindTexture
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-02-111-1/+2
| |\ \ \
| * | | | document the slowness of QPixmap::hasAlpha()Gunnar Sletta2010-02-111-4/+5
| | |_|/ | |/| | | | | | | | | | Reviewed-by: Kim
* | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-131-74/+63
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * | | Workaround for a certain functionally challenged compileraavit2010-02-101-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-101-73/+62
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix failing QDoubleValidator tests Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0. QMainWindow: update the separator size when the style change
| | * | | Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0.aavit2010-02-091-73/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libpng doc advises against accessing the info_ptr structure directly, and in 1.4.0 the members are flagged as deprecated, so such access gives compilation warnings. This patch makes qpnghandler use the recommended access functions instead. Reviewed-by: Trond
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-123-14/+48
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Prevented assert when using drop shadow effect in the GL 2 engine.Samuel Rødal2010-02-101-1/+2
| | |/ | |/| | | | | | | | | | | | | The GL 2 pixmap filter uses Indexed8 images in the drop shadow case. Reviewed-by: Tom Cooksey
| * | Fixed some global QIcon/QPixmap instances that leaked handles on X11.Trond Kjernåsen2010-02-091-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | Never ever create global cache objects that deletes QPixmaps when destructed! Task-number: QTBUG-8046 Reviewed-by: Friedemann Kleint
| * | Fixed warnings and crash when painting graphics effects outside scene.Yoann Lopes2010-02-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when an item had a QGraphicsEffect on itself and that item was outside of the sceneRect, the cached pixmap of the item was just an empty pixmap (when using DeviceCoordinates mode). Therefore the effect filter was trying to paint into an unformatted and empty image. Now, paint() for all pixmap filters just return immediatly when the pixmap is empty. Task-number: QTBUG-5358 Reviewed-by: sroedal
| * | Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.Trond Kjernåsen2010-02-081-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | Only the compiled in formats where checked when setAutoDetectImageFormat(false) was set on a QImageReader object. Task-number: QTBUG-7980 Reviewed-by: aavit
* | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-106-31/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (104 commits) Documentation: clarified RVCT support for Symbian Update Symbian OS def files for 4.6.2 Remove the installer from the Qt sources. Don't remove all dependencies when patching the pkg. Fixes qabstractslider autotest Workaround for abld toolchain issue with s60main Add a recursive rule for running the auto-tests. Do not run the tests automatically during install. Enabling runfast mode when vfpv2 used. Fixing a test case to be runnable on Symbian device. [CRASH] audioinput and audiooutput examples crash when no devices are Fixed casual crash in initializeDb (Symbian) Fixes scrolling horizontally with a mouse wheel over sliders. don't use QKeySequence::mnemonic() after all Fixed qt_x11_wait_for_window_manager Revert change 34f1758 on non-Synbian platforms Fixed QGifHandler::loopCount(). Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) don't use stylesheet for just making labels bold ...
| * \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-096-31/+57
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| | * Fixed a crash when QPixmaps are destroyed after the ~QApplication.Trond Kjernåsen2010-01-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying QPixmaps after the QApp destructor will leak native pixmap objects on X11, and it's a general rule that all GUI objects must be destroyed before the QApp destuctor is called. Task-number: QTBUG-7746 Reviewed-by: Kim
| | * Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-01-296-30/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes quite a lot of issues: * QtOpenGL only registered qpixmap destruction hooks on X11 and those only cleanup the EGL/GLX surface, not the texture object. * The QPixmap destruction hooks were only being called from the QPixmap destructor. However, this means when a QPixmap is assigned to another QPixmap, the hooks don't get called. Task-number: QTBUG-7647 Reviewed-By: Samuel Reviewed-By: Trond
* | | Added new mouse cursor types.Denis Dzyubenko2010-02-052-10/+18
|/ / | | | | | | | | | | | | | | | | | | | | Added Qt::DragCopyCursor, DragMoveCursor and DragLinkCursor that are already used internally for drag-n-drop, but were not exposed before. On X11 made them use themed cursors through the Xcursor library. Drag-n-drop now use these new cursors. Inspired-by: David Benjamin MR#2215 Reviewed-by: Bradley T. Hughes
* | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-4/+5
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-012-4/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Placate pedantic compiler warning modes on QGLBuffer Promote QPixmap::convertFromImage() to public API from Qt3Support Add the QGLBuffer class to Qt 4.7 for VBO's
| * | Promote QPixmap::convertFromImage() to public API from Qt3SupportRhys Weatherley2010-02-012-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPixmap::fromImage() creates a new pixmap from a QImage. There was no way to replace a pixmap with a new QImage in-place without using the private QPixmapData API. This change promotes the Qt3Support function convertFromImage() back to official status for updating a pixmap in-place. Task-number: QTBUG-7361 Reviewed-by: Tom Cooksey
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-261-1/+1
| | | | | | | | | | Task-number: QTBUG-7530 Reviewed-by: Kim
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-221-40/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| * \ Merge remote branch 'origin/master'Olivier Goffart2010-01-0811-161/+437
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-161-40/+9
| |\ \ \
| | * | | Character spacing when drawing a QPicture to a high DPI device.Trond Kjernåsen2009-11-131-40/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawing some text into a QPicture, and then drawing that QPicture to e.g. a QPrinter, would make the character spacing all wrong. The old approach that tried to fix this adjusted the DPI of the font that was used, so that the text size would be correct. It seems this is not enough, since it will lay out the text in the default resolution, and then scale that up, which may/may not introduce errors. Task-number: QTBUG-4974, 256481 Reviewed-by: Kim
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-131-2/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
* | | \ \ \ Merge branch '4.6'Thiago Macieira2010-01-211-7/+14
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-2064-66/+66
| |\ \ \ \ \
| * | | | | | Fixed QBitmap::load to load into bitmap format again.Gunnar Sletta2010-01-201-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: http://bugreports.qt.nokia.com/browse/QTBUG-7468 Reviewed-by: Trond
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-182-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Avoid an unnecessary copy in QImage::scaled().Trond Kjernåsen2010-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comes from the dark ages of Qt 3.x, where QImage was an explicitly shared class. Task-number: QTBUG-7231 Reviewed-by: Kim
| * | | | | | Removed pointless image comparison in raster colorize filter.Samuel Rødal2010-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is meant to check whether the grayscale operation is done in-place or not. Task-number: QTBUG-6901 Reviewed-by: Bjørn Erik Nilsen
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-1364-64/+64
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0864-64/+64
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0764-64/+64
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| | | * | | | | | Update copyright year to 2010Jason McDonald2010-01-0664-64/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-13 20:31:44 (GMT)