summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove useless profile reference.axis2011-03-222-4/+0
| | | | | | | The profile has been empty since the plugin functionality was moved into QtMultimedia itself (d73df73c556b0a225fdde7341549ed834bc691f4). RevBy: Miikka Heikkinen
* Fixed drawImage() not to attempt drawing null images on openvg.Laszlo Agocs2011-03-221-0/+4
| | | | | | | | | QVGPaintEngine did not have proper checks for null QImage in the drawImage functions so it went on trying to create a VGImage of size 0x0 which is bound to fail always. This resulted in confusing warnings about not being able to reclaim space for 0x0 images. Reviewed-by: Jani Hautakangas
* QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32
| | | | | | | | | | | | | | Once the background texture has been created, update it to all widgets. This corrects most cases where texture is used outside of QS60Style. It is still possible to access the placeholder texture and draw it, if: a) QPalette::Window is accessed before drawing even one widget b) Painting the texture happens without using QS60Style Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
* Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
| | | | | | | | | | | | Previously version resolved to unknown if Symbian or S60 version was queried and Series60v5.3.sis was found. Note that proper detection and enumerations for the new platform will come when they are agreed upon. Until then, this fix will make the new platform more usable. Task-number: QT-4593 Reviewed-by: Sami Merila
* Remove incorrect check in qpixmap autotest.Laszlo Agocs2011-03-211-3/+6
| | | | | | | | | | The test assumed that pixmaps do not have an alpha channel. This is not true on some platforms, e.g. Symbian with OpenVG, there pixmaps are often backed by some image data in ARGB32_Premultiplied format, which means that QPixmap::mask() will return a valid QBitmap. Task-number: QTBUG-18247 Reviewed-by: Jani Hautakangas
* Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-s60-public into 4.7Laszlo Agocs2011-03-211-0/+31
|\
| * Started changes-4.7.4 fileEckhart Koppen2011-03-211-0/+31
| | | | | | | | | | | | Placeholder file created to allow package creation Reviewed-by: TrustMe
* | Change the pooled QGLPixmapData to be backed by QVolatileImage.Laszlo Agocs2011-03-215-141/+128
|/ | | | | | | | | | This change currently affects QGLPixmapData on Symbian only. Similarly to the OpenVG engine, using QVolatileImage allows more efficient handling of to- and fromSymbianCFbsBitmap, reduces local heap usage, and improves s60 style performance. Task-number: QTBUG-15252 Reviewed-by: Jani Hautakangas
* Changed s60 style not to rely on QPixmapData::toNativeType().Laszlo Agocs2011-03-212-7/+6
| | | | | | | | | Forcing VG (and GL) pixmapdata to support toNativeType() with type VolatileImage is unnecessary. It is cleaner to try doing a fromNativeType() with bitmap+mask and fall back if that results in a null pixmapdata. Reviewed-by: Jani Hautakangas
* Add missing bitmap locking to QVGPixmapData::fromNativeType.Laszlo Agocs2011-03-211-2/+4
| | | | Reviewed-by: Jani Hautakangas
* Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.Laszlo Agocs2011-03-211-1/+5
| | | | | | | | | | Due to recent changes QPixmap::fromImage() can return RGB16 images for OpenVG pixmaps created from CFbsBitmap of display mode EColor64K. The qpixmap autotest assumed that the returned image is always 32 bpp which is not true anymore. Now it explicitly checks for 16 bpp and handles it properly. Reviewed-by: Jani Hautakangas
* Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the following rules applies to the creation and blitting of the Symbian raster backing store: 1. Creation of backing store with an alpha channel: Backing store has an alpha channel only if !QWidget::isOpaque. 2. Pre-filling of backing store prior to paint loop: Backing store is filled with transparent pixels if !QWidget::isOpaque. 3. Blitting of backing store: CGraphicsContext::EDrawModeWriteAlpha is used (meaning that backing store alpha values are propagated into the frame buffer), if QWidget::isOpaque. In order for the direct camera viewfinder to be visible on DSA devices, alpha=0 must be written into the framebuffer in the region where the viewfinder will be displayed. This requires a backing store with an alpha channel (1), use of CGraphicsContext::EDrawModeWriteAlpha (3), but not pre-filling of the entire backing store (2). This patch adds a new enum value, QWExtra::BlitWriteAlpha, which can be used by camera backends to achieve the desired behaviour. Task-number: QTMOBILITY-1278 Reviewed-by: Jani Hautakangas
* Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
| | | | Reviewed-by: Miikka Heikkinen
* Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
| | | | | | | | Builds will otherwise halt without giving reason if a wildcard is given in QMAKE_CLEAN in symbian-abld. Task-number: QTBUG-18207 Reviewed-by: axis
* Fix for wrong dpi metrics for raster pixmaps on Symbian.Laszlo Agocs2011-03-161-18/+11
| | | | | | | | | | | | The original implementation relied on SizeInTwips() for the underlying bitmap which unfortunately returns 0, leading to incorrect results from QPixmap::logicalDpiX/Y(). This caused issues in text rendering onto pixmaps (QTBUG-17628). This fix changes QS60PixmapData to use a slightly different metrics() implementation (the one VG and GL PixmapData are using). Task-number: QTBUG-18154 Reviewed-by: Jani Hautakangas
* Hot fix for compilation without QGL_USE_TEXTURE_POOLJani Hautakangas2011-03-151-0/+2
| | | | Reviewed-by: TRUSTME
* Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-1515-19/+1482
| | | | | | | | | Keep the implementation in separate qpixmapdata_poolgl.cpp file until the pooling has been verified and confirmed to work ok. Task-number: QTBUG-15253 QTBUG-17850 Reviewed-by: Samuel Rødal
* Fix the license info for bin/elf2e32_qtwrapper.pl.Liang Qi2011-03-151-0/+40
| | | | Reviewed-by: TrustMe
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-151-6/+8
|\
| * Avoid panics in QDesktopWidget on Symbian emulator.Laszlo Agocs2011-03-151-6/+8
| | | | | | | | | | | | | | | | There is usually only one screen on the emulator and it was incorrectly assumed that ScreenDevice() would return null for a non-existing screen. It panics instead so the entire call must be skipped. Reviewed-by: Sami Merila
* | QS60Style: use placeholder texture when polishing widgets and paletteSami Merila2011-03-153-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background texture is not created until it is actually painted. This allows skipping the whole background texture creation, if app overwrites the QPalette::Window with its own data (image or color). When widget is drawn and style notices that the widget is still using a placeholder (1*1 red QPixmap) texture, it creates the real texture and uses that for drawing. Note that accessing QPalette::Window will give the placeholder pixmap. Which is then again replaced with the real texture, if it is drawn through the qt_s60_fill_background(). Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
* | Regression: QS60Style: Theme background is incorrectSami Merila2011-03-151-0/+1
|/ | | | | | | | | | | | | | | | | Fix for QTBUG-16816 cause theme background to display incorrectly after a layout switch is done. Theme background is shown "tiled" instead of being whole screen size. This is because the setBackgroundTexture() call was removed to "save" QPixmap creation. Unfortunately, it really skips the background texture creation, but does not re-create a new one for the new layout, so portrait background is used again. This leads to tiling the image. Let's just return the call to the setBackgroundTexture() (this will eventually anyway be "optimized" with fix for QTBUG-14910). Task-number: QTBUG-17930 Reviewed-by: Laszlo Agocs
* Remove changes from fix to QTBUG-17045 that were not related to the fixSami Merila2011-03-151-12/+16
| | | | | | | | | There were changes included in the fix for QTBUG-17045 that were not supposed to be part of that fix. These changes to qcombobox.cpp are now removed. Task-number: QTBUG-17045 Reviewed-by: TrustMe
* Prevent null pointer crash when closing splitviewSami Merila2011-03-152-17/+14
| | | | | | | | Prevents crash when focus item is not set and splitview is closed. This is partial fix to QTBUG-17045. Task-number: QTBUG-17045 Reviewed-by: Guoqing Zhang
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-1436-429/+741
|\
| * Fix qgraphicstransform autotest for Symbian, where qreal is float.Laszlo Agocs2011-03-141-2/+12
| | | | | | | | | | | | Task-number: QTBUG-17907 Reviewed-by: Samuel Rødal
| * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-1435-427/+729
| |\ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * Removed reference to nonexistant profile.axis2011-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | Probably this was a result of backporting symbian-gcce support from 4.8 to 4.7. RevBy: Liang Qi
| | * Disable capabilities example for symbian-gcce due to a bug in elf2e32axis2011-03-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phonon exports template instantiations. These exports get weak symbol binding, which is correct according to the C++ ABI, but the problem is that elf2e32 has a bug which does not transfer the weak symbols correctly to the dso file. Therefore, the example will work if you have a prebuilt Qt version and use GCCE, but not if you build Qt from scratch using GCCE. For normal non-template symbols it is not a problem since they get global bindings. RVCT also produces global bindings. RevBy: Shane Kearns
| | * Readded a ';;' that was removed by mistake.axis2011-03-041-0/+1
| | | | | | | | | | | | RevBy: Trust me
| | * Fixed mkspec detection for Symbian.axis2011-03-041-3/+2
| | | | | | | | | | | | RevBy: Liang Qi
| | * Removed javascript-jit from default symbian-gcce build.axis2011-03-041-0/+2
| | | | | | | | | | | | | | | | | | It fails the build anyway. RevBy: Liang Qi
| | * Corrected a mismerge in GCCE link parameters.axis2011-03-041-1/+1
| | | | | | | | | | | | RevBy: Trust me
| | * Fixed incorrect referral to an include file.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Better to make it relative to the profile. That way it is always found, regardless of where Qt is located. RevBy: Liang Qi
| | * Fixed win32-msvc2008 build regression.axis2011-03-042-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | We needed to move the code in the init() function to the fixTargetExt() function, which is where the variables are actually used. The reason is that fixTargetExt() runs before init(). RevBy: Miikka Heikkinen
| | * Made qmake strip trailing \ from libdirs.axis2011-03-041-1/+4
| | | | | | | | | | | | | | | | | | | | | This was done because trailing \ would confuse the command line parser if the path was also quoted. RevBy: Oswald Buddenhagen
| | * Fixed GCCE libdir handling if the paths have spaces in them.axis2011-03-041-9/+9
| | | | | | | | | | | | RevBy: Trust me
| | * Added MinGW support for adding lib prefix and extension via profile.axis2011-03-044-9/+21
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * Added support for various special compiler/linker flags on MinGW.axis2011-03-041-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | This enables you to use QMAKE_xxx_yyy, where xxx is either CFLAGS, CXXFLAGS or LFLAGS, and yyy is either APP, SHLIB or PLUGIN. It is basically the same as the one in the UNIX generator. RevBy: Oswald Buddenhagen
| | * Added support for rvct_linker config in qmake's MinGW generator.axis2011-03-041-3/+11
| | | | | | | | | | | | RevBy: Trust me
| | * Avoided some MinGW specific codepaths when building Symbian libs.axis2011-03-042-3/+4
| | | | | | | | | | | | RevBy: Trust me
| | * Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | | This is just a mirror of the way the UNIX generator does it. See commits aaf189b084f52 and bdff51768dfe. RevBy: Oswald Buddenhagen
| | * Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-03-041-6/+6
| | | | | | | | | | | | | | | | | | | | | This usually points to the RVCT include directory, but those headers are not appropriate for Symbian. RevBy: Trust me
| | * Fixed a typo in src profile.axis2011-03-041-1/+1
| | | | | | | | | | | | RevBy: Trust me
| | * Fixed a build library deployment issue in sqlite.axis2011-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Make did not understand that sqlite3.dso, which the link relies on, is the same as $$OBJECTS_DIR/sqlite3.dso, which is extracted by the profile. RevBy: Trust me
| | * Fixed include in network module on Symbian.axis2011-03-041-1/+1
| | |
| | * Added object script support to RVCT when using MinGW qmake generator.axis2011-03-042-8/+40
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * Added Symbian makefile building support using MinGW backend.axis2011-03-043-4/+10
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * Fixed some tools definitions and properties in symbian profiles.axis2011-03-042-2/+3
| | | | | | | | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| | * Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.axis2011-03-041-3/+3
| | | | | | | | | | | | | | | | | | | | | It would not parse the line correctly if a space was missing between the "@" and the ordinal number. RevBy: Trust me
generated by cgit v0.12 at 2025-01-02 17:00:16 (GMT)