summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed "make run" target for targets with special characters in them.Miikka Heikkinen2009-12-102-13/+13
| | | | | | Some misc whitespace got fixed, too. Reviewed-by: Janne Anttila
* Rewrote most of the regular pointer handling.axis2009-12-092-90/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old implementation had been hacked on for a while and needed cleanup. The new code is heavily based on looking at the behavior of other platforms. It also reuses more of the cross platform code, which improves the handling of Enter and Leave events. We also switched to letting Symbian grab the pointer automatically when pressing down the mouse button, which improves things considerably compared to doing it ourselves. Popups should also work a lot better after this fix, since they were not really handled at all in the old code. The old code had calls to set the Symbian cursor sprite. This code has been removed since that code is now being called from within dispatchEnterLeaveEvents(). In addition, there was code to check whether the up key event had been left out by the platform. This was solved a bit differently now, instead putting the code in the section that handles virtual mouse, since that is where the problem occurs. Task: QTBUG-4990 RevBy: Shane Kearns AutoTest: N/A, Platform specific code that an autotest cannot catch. Lots of manual testing was done on normal examples as well drag'n'drop examples and it seemed to work fine.
* QS60Style: Do not let QCommonStyle draw PE_PanelScrollAreaCornerSami Merilä2009-12-091-1/+3
| | | | | | | | | | | | | | | | | If QS60Style lets QCommonStyle to draw PE_PanelScrollAreaCorner, common style draws transparent small rect to the end of scrollbar. This is due to our style's palette's Base is Qt::Transparent. Error is only visible when two dialogs/windows are on top of each other and their background is such that a hole in the upper dialog's background will make the hole "visible" (i.e. background is not similar). As a fix, QS60Style should not let QCommonStyle draw the primitive, but instead handle itself (and do nothing with it). Task-number: QTBUG-6657 Reviewed-by: Alessandro Portale
* Missing library added to QStringList benchmark for Symbian buildsMiikka Heikkinen2009-12-091-0/+2
| | | | | | | | QStringList benchmark uses some std classes which indirectly need pthread library. Task-number: QTBUG-6594 Reviewed-by: Janne Anttila
* Access to image needs to be protected in QS60PixmapDataMiikka Heikkinen2009-12-091-0/+6
| | | | | | | | The image can get corrupted if access to it is not properly surrounded with beginDataAccess and endDataAccess calls. Task-number: QTBUG-6050 Reviewed-by: Jani Hautakangas
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵axis2009-12-096-97/+78
|\ | | | | | | 4.6-staging2
| * Clean up debug message with DirectFBAnders Bakken2009-12-091-29/+29
| | | | | | | | | | | | Remove some superfluous spaces. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Enable customizing of DirectFB layer to useAnders Bakken2009-12-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | This patch enables you to use a different layer for Qt apps by specifying: E.g. QWS_DISPLAY=directfb:layerid=2 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Set stacking class for stays-on-top windows in DFBAnders Bakken2009-12-091-1/+3
| | | | | | | | | | | | | | | | For better compatibility with non-QWS DirectFB apps running in the same session we should set the stacking class of Windows that have the StaysOnTop flag set. This corresponds nicely to DWSC_UPPER. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-09180-1189/+3340
| |\
| | * Export QGLShareRegister because qgl_share_reg() is exportedRhys Weatherley2009-12-091-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| | * Fix upside down PVR compressed textures.Rhys Weatherley2009-12-081-3/+4
| | | | | | | | | | | | | | | | | | | | | The "vertical flip" flag in the PVR format is the inverse of the "inverted y" state that we use in Qt. Reviewed-by: trustme
| | * Make sure a context is current when loading compressed textures.Rhys Weatherley2009-12-081-0/+2
| | | | | | | | | | | | Reviewed-by: trustme
| * | Speed up rotated/transformed text on OpenGL2 paint engineGunnar Sletta2009-12-081-61/+34
| | | | | | | | | | | | | | | Reviewed-by: Trond Reviewed-by: Tom
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-087-500/+340
|\ \ \ | |_|/ |/| | | | | 4.6-staging2
| * | Def file updatesShane Kearns2009-12-082-17/+26
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Implement qsrand() for Symbian OSShane Kearns2009-12-081-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | After checking the source code of OpenC stdlib, rand and srand are thread safe (they use Symbian's TLS internally) so the Symbian implementation mostly follows the Windows one (where this is also true) Task-number: QTBUG-6372 Reviewed-by: Janne Koskinen
| * | Crash: when opening the File Dialog in Media Player (armv5)Sami Merilä2009-12-084-470/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to NGA API changes in Tb9.2. Because of API changes, S60Style needs to have a lot of internal changes. First, the changed style no longer itself tries to uncompress and handle CFbsBitmaps, but instead uses the QPixmap backend for it. Second, all references to CFbsBitmap::DataAddress() have been removed. Third, the lookup table for theme parts has been cleaned up. Task-number: QTBUG-4644 Reviewed-by: Janne Koskinen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-12-088-15/+28
|\ \ \ | |/ /
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-083-1/+10
| |\ \ | | | | | | | | | | | | 4.6-staging2
| | * | Minor fixes to softkey dimming support (commit 245c9cc0).Janne Anttila2009-12-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt invisible actions are disabled by default, and our "Options" softkey is set to invisible in order that it is not show in context menu. Thus we need don't want to dim in softkey even it is disabled. Additionally, QDialogButtonEnabledProxy need to set the initial enabled state for proxy action from button. Fixes bugs in commit: 245c9cc0 Reviewed-by: TrustMe
| | * | FEP returns the wrong foreground color in GetFormatOfFepInlineTextSami Merilä2009-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using T9, FEP is always using black text color. This is due to that we use default parameters for TFontPresentation. If we change the text color according to style, before calling GetFormatOfFepInlineText, it uses color value from style. Task-number: QTBUG-4072 Reviewed-by: axis
| * | | Fixes broken graphics effect auto tests.Bjørn Erik Nilsen2009-12-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | This broke after commit: fb78a402b512b017c850e7410745c4d20da04a7c Effects and auto-tests are now in line with the documentation.
| * | | Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects.Bjørn Erik Nilsen2009-12-082-0/+4
| | | |
| * | | Remove id property from QGraphicsObjectAlan Alpert2009-12-082-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not actually useful (exact same READ/WRITE as objectName) and is confusing when used in QML. Task-number: QTBUG-6580 Reviewed-by: andreas Reviewed-by: alexis Reviewed-by: ogoffart
| * | | Fix GL_BGRA formats under OpenGL/ES systemsRhys Weatherley2009-12-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL/ES requires that the internal and external formats be the same when calling glTexImage2D(). This caused problems with devices that had the GL_EXT_bgra extension. This change makes the formats the same just before the upload and also makes sure that the pixel type is GL_UNSIGNED_BYTE when GL_BGRA is used. No change for desktop systems. Reviewed-by: Donald Carr
* | | | Fix possible off-by-one inconsistency against system look and feel whenEskil Abrahamsen Blomfeldt2009-12-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawing vertically aligned text When text is drawn in a font which has an odd-numbered height and it's vertically aligned in a rectangle which has an even-numbered height (or vice versa) we have to round the y-position, as the backend cannot position the text in subpixels. The y-position in this case will be at half a pixel and we can either round it up or down without increasing the size of the error. In Qt 4.5, the font height would be reported as one higher than what it actually was. Therefore, in many widgets such as comboboxes, we would appear to round the y-position down when faced with this issue. This is apparently also what Windows does, probably because most latin fonts have more glyphs extending into the maximum descent than the ascent. In Qt 4.6, the font height bug was fixed, and since we use qRound() we now round half-pixels up, thus moving all the text faced with this issue one pixel down. This looks odd and inconsistent, both with the platform look and feel and with older versions of Qt. The patch reverts to the old look and feel by rounding the half pixels down rather than up for the particular case in question. Task-number: QTBUG-6578 Reviewed-by: Samuel
* | | Compilation fixThierry Bastian2009-12-071-0/+1
| | |
* | | Assert in designer while drag & dropping items from a QListWidgetGabriel de Dietrich2009-12-072-1/+3
| | | | | | | | | | | | | | | | | | | | | Did not honour returned value from beginMoveRows(). Auto-test included. Reviewed-by: leo Task-number: QTBUG-6532
* | | Fixed memory leaks when removing a QGraphicsEffect from a QGraphicsItem or ↵Yoann Lopes2009-12-077-28/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWidget with setGraphicsEffect(0). The effect was not deleted in that case, problem solved for both QGraphicsItem and QWidget. Autotest included. Task-number: QTBUG-5917 Reviewed-by: bnilsen
* | | Fix the toolbars dockingThierry Bastian2009-12-071-5/+10
|/ / | | | | | | | | | | | | | | | | The gap could be inserted even if the toolbar is very far away. This is due to the fact that we were only considering the distance as 1-directional. Now we also check that mouse position is inside the main window. Reviewed-by: gabi
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-079-94/+221
|\ \ | | | | | | | | | 4.6-staging2
| * | Added dimming support for disabled softkeys in Symbian.Janne Anttila2009-12-072-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QAction::setEnabled(false) is called, the CBA buttons are dimmed to have visual indication about disabled state. Since enabled/disabled state of buttons in QDialogButtonBox is controlled via QPushButton::setEnabled API, and because button box content in Symbian is mapped to sofkkeys we also need to have proxy for button enabled state to forward the information for underlying QAction. Reviewed-by: Sami Merila
| * | Remove compilation warning from S60pixelMetrics on ARMSami Merilä2009-12-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling s60pixelMetrics utility for ARMV5 urel gives two warnings: a) unused variable - Solution: removed b) transfer of control bypasses initialization (missing brackets within a switch-case) - Solution: brackets added. Reviewed-by: TrustMe
| * | Button and LineEdit/TextEdit theme colors are incorrectSami Merilä2009-12-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style fetches incorrect color values from theme when using buttons and lineEdits/TextEdits. New values are the same as in native widgets (verified from native widget code). Task-number: QTBUG-6364 Reviewed-by: Alessandro Portale
| * | QS60Style: Overwrites correct stylehint color valuesSami Merilä2009-12-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style overwrites correct theme colors with QCommonStyle values in QS60Style::styleHint(). In that method returned value is initialized as -1 and then if the value is still -1 after switch statement for different stylehints, the stylehint is queried from common style. Problem is that it is also getting RGB values set into return value. White color as HEX is FFFFFF and -1 as HEX is FFFFFF. So, if theme color is white for Group Text title, or for Grid lines, color is asked from QCommonStyle instead. As a fix, in 'default' case ask from QCommonStyle. Also, use RGBA instead of RGB values. Reviewed-by: Alessandro Portale
| * | MMP_RULES overriding qmake variables now warns userMiikka Heikkinen2009-12-042-50/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added warning to qmake when it detects MMP_RULES that override MMP statements created by qmake variables. Also harmonized the way << operator is used with #defined strings in symmake.cpp. Task-number: QTBUG-5407 Reviewed-by: Janne Anttila
| * | Switched S60 QDesktopServices implementation to CDocumentHandler based.Janne Anttila2009-12-042-24/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RApaLsSession based implementation did not succeed to start music player in some S60 devices to playing mode. The only found solution to this problem was to start using CDocumentHandler based implementation. CDocumentHandler adds a new S60 dependency, but it is needed to make QDesktopServices APIs fully fuonctional. However if Qt is comfigured without S60 we still fallback to RApaLsSession implementation. With CDocumentHandler the files are also opened as embedded, due to the fact that swicthing files in stand-alone mode would require SwEvent capability. Task-number: QTBUG-4699 Reviewed-by: Miikka Heikkinen
| * | Fixed "...QString::QString(const char *)... is deprecated" warning.Janne Anttila2009-12-031-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-6290 Reviewed-by: TrustMe
| * | Unnecessary symbian version checks in sqldrivers.proJouni Hiltunen2009-12-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version checks in sqldrivers.pro are not needed. These version checks also fail if symbian version does not match to 3.1 3.2 or 5.0. The included sqlite_symbian.pro checks if the binaries are already present or not. Reviewed-By: Shane Kearns
| * | QS60Style: Always store changed theme paletteSami Merilä2009-12-031-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When style updates its background brush, it updates QApplication's palette with new background. Also member variable m_backgroundBrush is updated. What is NOT updated is the member variable m_themePalette, which should also contain correct updated palette. This change updates m_themePalette and moves palette updations to occur in one place so that in all use-cases the palettes are modified in a unified way. Task-number: QTBUG-6427 Reviewed-by: Alessandro Portale
* | | Fix programming error in autotest commit 8529a8cbbPaul Olav Tvete2009-12-071-2/+1
| | | | | | | | | | | | | | | setWindowFlags() resets the flags, so the previous version only worked on X11.
* | | Detect GL2 paint engine based on fragment shaders, not programsRhys Weatherley2009-12-072-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | The auto-detect logic was looking for fragment programs to check for OpenGL2 support. It should have been looking for fragment shaders. Task-number: QTBUG-5638 Reviewed-by: Sarah Smith
* | | Automatically destroy VG pixmaps when the last window surface goes awayRhys Weatherley2009-12-064-29/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under S60, Qt will destroy the window surfaces of an application that goes into the background, which frees up EGL surface objects. But the VGImage's for pixmaps, and the EGLContext, were still using GPU memory. This change keeps track of the number of widgets / window surfaces that are in use and then calls hibernate() on all QVGPixmapData objects when it goes to zero. Once all the VGImage's are destroyed, the EGLContext should also be destroyed. Task-number: QT-2555 Reviewed-by: Sarah Smith
* | | Change file update for compressed texture support.Rhys Weatherley2009-12-061-4/+9
| | |
* | | Compressed texture binding for QtOpenGL: ETC1 and PVRTCRhys Weatherley2009-12-065-118/+461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGLContext::bindTexture(QString) function has been augmented with support for ETC1, PVRTC2, and PVRTC4 compressed textures, in addition to the existing DDS support. The QGLPixmapData class has also been modified to recognize compressed texture formats in fromFile() and fromData(). This change also fixes a bug in bindTexture() that prevented the same compressed texture file from being bound in multiple contexts. There is now a separate file cache for each context group. Task-number: QT-2547 Reviewed-by: Trond
* | | Fix WA_TranslucentBackground for QGLWidgets on X11/EGLTom Cooksey2009-12-041-45/+73
| | | | | | | | | | | | | | | | | | | | | Also check for existing QEglContext before creating a new one and leaking a context. Reviewed-by: TrustMe
* | | Add EGL_BUFFER_SIZE to QEglProperties::reduceConfiguration()Tom Cooksey2009-12-041-0/+9
| | | | | | | | | | | | Reviewed-by: Trustme
* | | Fixes problem with QMenu when it's populated on the aboutToShowPierre Rossi2009-12-045-32/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the menu is populated that late, if the menu is to go off-screen, then it is moved and ends up covering its originating button. Includes some code cleanup thanks to Thierry's tips. Reviewed-by: Gabriel Reviewed-by: Thierry
* | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-0470-231/+746
|\ \ \
generated by cgit v0.12 at 2024-11-16 04:28:08 (GMT)