summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Update to the latest version of the copyright headers.Paul Olav Tvete2009-09-3032-128/+128
|
* Merge branch '4.6' into lighthousePaul Olav Tvete2009-09-30150-648/+960
|\ | | | | | | | | | | | | | | Conflicts: configure src/gui/image/qpixmapdatafactory.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qgraphicssystem.cpp
| * QString(" => QString::fromLatin1("Anders Bakken2009-09-291-1/+1
| | | | | | | | | | | | Prevent qWarning when building with QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-292-2/+5
| |\
| | * Fix a alpha issue with RGB32 and DirectFBAnders Bakken2009-09-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can't use RGB32 format with DirectFB (issues regarding Qt's assumptions about the alpha byte) we need to explicitly convert images of this type to the preferred alphaPixmap format. This fixes an issue where RGB32 images get a curious gray alpha overlay. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * Fix QT_VNC_NO_DISABLEPAINTING logicPaul Olav Tvete2009-09-251-1/+1
| | | | | | | | | | | | | | | | | | Oops... Reviewed-by: Jeremy
| * | Fixed build errors due to header filename clashes between epoc32/include and ↵Gareth Stockwell2009-09-281-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | Phonon. Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one. A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
| * | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-249-15/+126
| |\ \ | | |/
| | * Fix 3.1 build - move unimplemented RFs API to the S60 pluginShane Kearns2009-09-237-7/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | RFs::GetSystemDrive doesn't exist in 3.1 (even though it is in the symbian documentation). Moved it to a new function in the S60 plugins. For 3.1, it returns EDriveC, for all other versions the RFs API is used Task-number: QT-805 Reviewed-by: Iain
| | * Don't disable painting with multiple screens and VNCJeremy Katz2009-09-232-8/+14
| | | | | | | | | | | | | | | Task-number: QTBUG-4473 Reviewed-by: Paul
| * | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-23146-2750/+3771
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml demos/embedded/fluidlauncher/fluidlauncher.pro src/corelib/io/io.pri src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qwidget_s60.cpp src/s60installs/qt_libs.pro
| | * QJpegImageHandle: Avoid smooth scalling when it should not.Olivier Goffart2009-09-231-1/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-3211 Task-number: 236875 Reviewed-by: Alex
| | * A pen/brush can be invalid and have a valid colorAnders Bakken2009-09-181-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is wrong: if (brush != Qt::NoBrush) ... It should be: if (brush.style() != Qt::NoBrush) ... Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| | * Implement QDirectFBPaintEngine::drawRoundedRectAnders Bakken2009-09-182-1/+10
| | | | | | | | | | | | | | | | | | We need to lock before falling back to QRasterPaintEngine Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| | * Fix a bug in QDirectFBWindowSurface::scrollAnders Bakken2009-09-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that one cannot do multiple blits within a double-buffered surface in overlapping one another without doing a Flip in between. I find this a little odd and will check that it's the correct behavior but this fixes bugs in scroll(). To see a case that used to produce drawing errors check out the collidingmouse example and drag the viewport around. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| | * Merge commit 'origin/4.5' into 4.6Rhys Weatherley2009-09-171-0/+7
| | |\
| | | * Fix compilation for systems with MBX PowerVR headers.Rhys Weatherley2009-09-171-0/+7
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Tom Cooksey2009-09-172-50/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtwidgets/tst_qtwidgets.cpp
| | | * | Simplify QDirectFBPixmapData::fromDataBufferAnders Bakken2009-09-161-48/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for the intermediate surface creation. RenderTo will handle things like palette/transparency etc. Should also provide some speedup. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | | * | Make QT_DIRECTFB_PALETTE an opt-in optionAnders Bakken2009-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems not work correctly on quite a few boards so I'd rather have people turn it on explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | Merge branch '4.5' into 4.6Tom Cooksey2009-09-171-2/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| | | * | Make the PowerVR screen driver for QWS compile against shipped headersTom Cooksey2009-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pvr2d.h/wsegl.h headers we ship with Qt (in src/3rdparty/powervr) are meant for the PowerVR SGX. However, we use an MBX-specific define in the powervr driver. Reviewed-by: Jørgen Lind
| | | * | Update license headers again.Jason McDonald2009-09-08136-544/+544
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Fixes the gif plugin's rendering for some animated gif files.Pierre Rossi2009-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of optimized animated gifs, we don't want to discard the contents of the previous frame, this is handled if needed in the disposal process. Task-number: 247365 Reviewed-by: Samuel
| | * | | Update the QWS PowerVR driver's pro to use the new EGL qmake varsTom Cooksey2009-09-171-2/+2
| | | |/ | | |/| | | | | | | | | Reviewed-by: Trustme
| | * | Export a function for getting a IDirectFBWindowAnders Bakken2009-09-154-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | This function is only exported when DirectFB is built into QtGui. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | Export two functions for getting a surface in dfbAnders Bakken2009-09-152-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When building DirectFB as part of QtGui and not as a plugin this patch will export two global functions for getting a surface given a widget. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | Fix a bug in surfaceForWidgetAnders Bakken2009-09-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | I had the logic of the assert wrong with the isAncestorOf call. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | Enabled use of graphics system with old GL engine for testing.Samuel Rødal2009-09-111-1/+9
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| | * | Fix a bug with mouse events in DirectFBAnders Bakken2009-09-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert a974ce81d6324d8d85ade0153b5ce7c757ba4fdf. It seems odd to just ignore the actual data in the input event but when the layer and the event differs the layer is correct. Reviewed-by: TrustMe
| | * | DWDESC_OPTIONS was added for DirectFB 1.1Anders Bakken2009-09-101-1/+4
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | s/DIRECTFB_MINOR_VERION/DIRECTFB_MINOR_VERSION/Anders Bakken2009-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This will make DirectFB version tests work. Reviewed-by: TrustMe
| | * | Use fromLatin1() in QDirectFBScreen::connect()Anders Bakken2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Avoid warning when building DirectFB as part of Qt. Reviewed-by: TrustMe
| | * | Some unneeded semicolons lessAlessandro Portale2009-09-091-1/+1
| | | |
| | * | Update license headers again.Jason McDonald2009-09-09137-548/+548
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fix QDirectFBPixmapData::fromImageAnders Bakken2009-09-081-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix should optimize pixmap loading on most platforms and also fixes a bug on a certain hardware where the alpha channel of an image was not retained upon loading it. This patch also takes care of handling dithering better in QDirectFBPixmapData::fromImage(). Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | Fix define in QDirectFBScreenAnders Bakken2009-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's QT_NO_DIRECTFB.*, not QT_DIRECTFB_NO.* Reviewed-by: TrustMe
| | * | memset DFBWindowDescription to 0Anders Bakken2009-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This makes debugging easier. Reviewed-by: TrustMe
| * | | Rename videoplayer, to avoid clash with Symbian's headers.Frans Englich2009-09-231-2/+2
| | | |
| * | | Experimenting to make video visible.Gareth Stockwell2009-09-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the hack to set translucent window background in the mediaplayer. Then tried the following: 1. Direct write to backing store: does not work (backing bitmap is 16MU) 2. Set window background color: does not work (is over-written by control's Draw function) 3. Brush using CWindowGc from widget's paint event: does not work (is over-written by control's Draw function) 4. Hack QSymbianControl to blit a transparent bitmap from the Draw function: does work 5. Hack QSymbianControl to brush using CWindowGc from the Draw function: does work Configuration 5 is the one being committed. Other things we could try: 6. Trigger switch to 16MA backing store if child widgets have been created. This could be tested by calling RWindowTreeNode::Child on the TLW's window. - Maybe we could test whether the child window's display mode is 16MA? 7. Somehow tell QSymbianControl not to draw anything at all - Based on setting Qt::WA_PaintOnScreen? - Then we either: - (Ideally) do nothing, and rely on video stack to paint the necessary transparency - Brush using CWindowGc from widget's paint event
| * | | RoomLevel is not available in SDK 3.1, remove it.Frans Englich2009-09-231-1/+1
| | | | | | | | | | | | | | | | In any case, we haven't implemented this effect.
| * | | Replaced explicit epoc32/include path with (more portable) ↵Gareth Stockwell2009-09-231-1/+1
| | | | | | | | | | | | | | | | MW_LAYER_SYSTEMINCLUDE macro
| * | | Added a utility function for reading color of individual pixels from the screenGareth Stockwell2009-09-231-0/+1
| | | |
| * | | Make mmfphonondebug static, and do some build fixes.Frans Englich2009-09-163-3/+5
| | | |
| * | | Fixes to include paths, required due to objectdump renamingGareth Stockwell2009-09-151-2/+2
| | | |
| * | | Rename objectdump to mmfphonondebug in order to avoid conflicts.Frans Englich2009-09-142-3/+3
| | | |
| * | | Reserve & use UIDs.Frans Englich2009-09-142-4/+5
| | | |
| * | | Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Gareth Stockwell2009-09-101-5/+3
| |\ \ \ | | | | | | | | | | | | | | | mmfphonon
| | * | | Simplify inclusion of osextensions.Frans Englich2009-09-091-5/+3
| | | | |
| * | | | Fixed problems with compiling for ARMV5Gareth Stockwell2009-09-101-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | - Forward declaration of QScopedPointer containee type was causing an error - Audio effect libraries were declared in the .pro file as e.g. -lBassBoostEffect.lib, causing toolchain to try to link statically - Added several missing MMF:: namespace qualifiers
generated by cgit v0.12 at 2025-03-16 09:20:31 (GMT)