summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-1911-64/+107
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-197-60/+103
| |\ | | | | | | | | | | | | Conflicts: tests/auto/auto.pro
| | * Make sure windows raise properly when focusedAnders Bakken2009-08-183-25/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never used to properly raise windows with DirectFB's window management. Somehow the event happens on a window surface that doesn't really have a IDirectFBWindow associated with it but using permanentState I can establish a sibling relationship to ensure raise gets called on the right window surface. Reviewed-By: Donald <qt-info@nokia.com>
| | * Initialize bpl in QDirectFBPaintDevice(...)Anders Bakken2009-08-181-1/+1
| | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | * Disambiguate variable namesAnders Bakken2009-08-182-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | s/lock/lockFlgs/ lock is also a function in QWSWindowSurface. Reviewed-by: Donald <qt-info@nokia.com>
| | * Simplify DirectFB clippingAnders Bakken2009-08-182-25/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing whether or not our clip is dirty and updating it in every paint operation we'll just update it whenever it changes. This is more intuitive and should be faster for the common case as well. Also make sure to implement clip(region). Prevent multiple updateClip() calls for a single clip operation by introducing a flag to check whether we recursed into the different clip() calls. Reviewed-by: Donald <qt-info@nokia.com>
| | * Fix bugs in DFBPE fillRect and drawTiledPixmapAnders Bakken2009-08-181-3/+2
| | | | | | | | | | | | | | | | | | Make sure to call CLIPPED_PAINT so painting with a region clip works. Reviewed-by: Donald <qt-info@nokia.com>
| | * Make sure to update pos QDFBCursor::moveAnders Bakken2009-08-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | We don't need to chain to the base class since the QDirectFBScreenCursor always is rendered by hardware but we should update the pos variable in case people ask where the cursor is. Reviewed-by: TrustMe
| * | Changed names and URLs to reflect name change.axis2009-08-194-4/+4
| | | | | | | | | | | | RevBy: Trust me
* | | Trivial fixes for src/plugins/imageformats after review.Janne Anttila2009-08-192-4/+6
|/ / | | | | | | Reviewed-by: TrustMe
* | Merge commit 'qt/master'Jason Barron2009-08-186-111/+280
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * Clean up DirectFB with WM enabledAnders Bakken2009-08-174-76/+123
| | | | | | | | | | | | | | | | When we have proper window manager support from DirectFB we shouldn't create our own primary surface. This patch vastly cleans up a number of issues in QDirectFBScreen regarding this. Reviewed-by: Donald <qt-info@nokia.com>
| * Clean up DirectFB definesAnders Bakken2009-08-171-0/+25
| | | | | | | | | | | | | | Make QT_DIRECTFB_WM be defined if QT_NO_DIRECTFB_WM is not. This makes it possible to write more readable code. Reviewed-by: Donald <qt-info@nokia.com>
| * Clean up primary surface handling in DFBAnders Bakken2009-08-173-28/+26
| | | | | | | | | | | | | | To avoid confusion rename QDirectFBScreen::dfbSurface() primarySurface() since this is what it is. Reviewed-by: Donald <qt-info@nokia.com>
| * Fix a bug in wrt DFBWindowSurface's paintEngineAnders Bakken2009-08-172-12/+6
| | | | | | | | | | | | | | Make sure we recreate the paint engine if it's 0 in beginPaint. Also don't delete the paint engine in moves, only resizes. Reviewed-by: Donald <qt-info@nokia.com>
| * Add support for the orientation of tiff imagesBenjamin Poulain2009-08-171-1/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | The orientation tag was ignored for tiff images. The tag is now used to rotate the image before providing it to the user. The orientation of indexed an mono images is done completely manually. The orientation of other type is done in conjunction to the mirroring already performed by libtiff. Task-number: 258526 Reviewed-by: Samuel Rødal
| * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
* | Merge commit 'qt/master'Jason Barron2009-08-13130-138/+138
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-122-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-126-6/+6
| | | | | | | | Reviewed-by: Trust Me
| * Update contact URL in license headers.Jason McDonald2009-08-12130-130/+130
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers according to commit 858c70f768e.axis2009-08-064-8/+8
| | | | | | | | RevBy: Trust me
* | Replaced $MODULE$ with hardcoded module names.axis2009-08-064-4/+4
| | | | | | | | RevBy: Trust me
* | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-062-2/+2
| | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* | Merge commit 'qt/master-stable'Jason Barron2009-08-062-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * Merge AudioServices into mainline.Justin McPherson2009-08-052-0/+4
| |
* | Merge commit 'origin/master'Jason Barron2009-08-0410-18/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | Trailing whitespace and tab/space fixes for src/pluginsJanne Anttila2009-08-048-8/+3
| | |
| * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-033-10/+12
| | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-0410-161/+268
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | Merge branch '4.5'Thiago Macieira2009-08-0310-156/+262
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * | Qtify void* func => void *funcAnders Bakken2009-07-281-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Refactor QDirectFBPaintDeviceAnders Bakken2009-07-287-34/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the engine a member in QDirectFBPaintDevice instead of one in QDirectFBPixmapData and one in QDirectFBWindowSurface. Don't use the default screen for the dfbpaintdevices. Pass one explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | Make autorepeat work for DirectFBAnders Bakken2009-07-281-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When holding down a key DirectFB gives us only keypresses. Qt wants these kind of events: press not autorepeat release autorepeat press autorepeat release autorepeat press autorepeat release not autorepeat Reviewed-by: Donald <qt-info@nokia.com>
| | * | Fix crash in when resizing directfb windowsAnders Bakken2009-07-282-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QRasterPaintEngine::baseClip was initialized when the QDirectFBPaintEngine was created and the paintengine persists for the window surface we run the risk that the baseClip is of the wrong size. This could lead to crashes and erroneous clipping. Reviewed-by: Donald <qt-info@nokia.com>
| | * | Compile with DirectFB < 1.0Anders Bakken2009-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | These porter duff operations were added for 1.0. Reviewed-by: Donald <qt-info@nokia.com>
| | * | Remove ignore system clip stuff in dfbpaintengineAnders Bakken2009-07-282-5/+1
| | | | | | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | * | Fix off-by-one bug in QDirectFBScreen::flipSurfaceAnders Bakken2009-07-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DFBRegions are exactly like QRects it turns out. x2/y2 == QRect::right()/QRect::bottom() This means I actually can reinterpret_cast QRect to DFBRegions but it's not really worth it. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | Major clipping patch in QDirectFBPaintEngineAnders Bakken2009-07-281-75/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle region clips by iterating over the rectangles and updating clips accordingly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | Make porterduff operations work in DirectFBAnders Bakken2009-07-281-33/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes us not fall back to the raster engine for most of the composition mode operations when doing blits. Primitives are still handled by Qt when composition != SourceOver Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * | | Crash DirectFb plugin when resizing verticalyJørgen Lind2009-07-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QRasterPaintEngine assumes device does not change size. Therefore create a new engine when resizing. Reviewed-by: Tom
| * | | Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-301-3/+2
| |\ \ \
| | * | | Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new class alows more than one hook to be installed at a time and, for QPixmaps, the hook is told which pixmap is getting deleted. Reviewed-By: Samuel
* | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * | | | Remove a warning in qdirectfbpaintengineAnders Bakken2009-07-281-3/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | These structures are only used in versions after 0.922. Reviewed-by: Donald <qt-info@nokia.com>
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-286-315/+300
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-246-315/+300
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h src/3rdparty/webkit/WebCore/page/DragController.cpp src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp src/gui/painting/qpaintengineex_p.h tools/linguist/lupdate/main.cpp
| | * | return when brush is NoBrush in DFBPaintEngineAnders Bakken2009-07-231-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | Fix a bug in directfb mouse handlingAnders Bakken2009-07-222-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always check the mouse data we read for coordinates rather than asking the layer. This approach works whether we have layers enabled/window management enabled or any combination thereof. Also, make sure we use a software cursor when either of NO_WM or NO_LAYER is defined. Reviewed: Donald <qt-info@nokia.com>
| | * | Use BatchBlit in flush/exposeRegionAnders Bakken2009-07-222-35/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor optimization. Also make sure cursor is drawn in flush even if we're not in Offscreen mode. Reviewed-by: TrustMe