| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Export QGLShareRegister because qgl_share_reg() is exported
Fix upside down PVR compressed textures.
Make sure a context is current when loading compressed textures.
Fix possible off-by-one inconsistency against system look and feel when
Fixes broken graphics effect auto tests.
Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects.
Remove id property from QGraphicsObject
Minor fixes to softkey dimming support (commit 245c9cc0).
FEP returns the wrong foreground color in GetFormatOfFepInlineText
|
| | |
| |
| |
| | |
Reviewed-by: trustme
|
| | |
| |
| |
| |
| |
| |
| | |
The "vertical flip" flag in the PVR format is the inverse of the
"inverted y" state that we use in Qt.
Reviewed-by: trustme
|
| | |
| |
| |
| | |
Reviewed-by: trustme
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | | |
4.6-staging2
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This broke after commit: fb78a402b512b017c850e7410745c4d20da04a7c
Effects and auto-tests are now in line with the documentation.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix GL_BGRA formats under OpenGL/ES systems
Compilation fix
Assert in designer while drag & dropping items from a QListWidget
Fixed memory leaks when removing a QGraphicsEffect from a QGraphicsItem or QWidget
Fix the toolbars docking
Added dimming support for disabled softkeys in Symbian.
Remove compilation warning from S60pixelMetrics on ARM
Button and LineEdit/TextEdit theme colors are incorrect
QS60Style: Overwrites correct stylehint color values
MMP_RULES overriding qmake variables now warns user
Switched S60 QDesktopServices implementation to CDocumentHandler based.
Fixed "...QString::QString(const char *)... is deprecated" warning.
Unnecessary symbian version checks in sqldrivers.pro
QS60Style: Always store changed theme palette
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Did not honour returned value from beginMoveRows(). Auto-test included.
Reviewed-by: leo
Task-number: QTBUG-6532
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |\
| | |
| | |
| | | |
4.6-staging2
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6290
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix programming error in autotest commit 8529a8cbb
|
| | | |
| | |
| | |
| | |
| | | |
setWindowFlags() resets the flags, so the previous version only worked
on X11.
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (35 commits)
Detect GL2 paint engine based on fragment shaders, not programs
Automatically destroy VG pixmaps when the last window surface goes away
Change file update for compressed texture support.
Compressed texture binding for QtOpenGL: ETC1 and PVRTC
Fix WA_TranslucentBackground for QGLWidgets on X11/EGL
Add EGL_BUFFER_SIZE to QEglProperties::reduceConfiguration()
Fixes problem with QMenu when it's populated on the aboutToShow
Fixed OpenGL graphicssystem issues for OpenGL ES 2.0 platforms.
Made qobject.h "syncqt compliant".
Fix toolbar animation when restoring from expanded state
Make sure that QtGui links with QtCore for the win32-icc mkspec.
Fixes clipping bug in the embedded dialogs demo.
Made sure that we didn't reference dangling parallel anchors.
Add QMake configuration for Scratchbox's host-gcc compilera
Remove the linux-g++-gles2-experimental mkspec
Fix crash when QGraphicsItem destructor deletes other QGraphicsItem
Make lrelease link again with the win32-icc and win32-g++ mkspecs
Rename the global limit to g_offset.
Revert "Compile fix for win32-icc."
QGAL: Remove deprecated assert clauses
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also check for existing QEglContext before creating a new one and
leaking a context.
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trustme
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The format and internal_format parameters to glTexImage2D need to always
match on OpenGL ES 2.0.
Reviewed-by: Tom Cooksey
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-6529
Reviewed-by: Gabi
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The previous patch to this file made syncqt confused (maybe because
of the brackets), and caused it to not generate the QObject header file.
This made of course a lot of stuff not compile. With this patch syncqt
behaves.
Reviewed-by: Olivier Goffart
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix it by exporting QObjectData. Since this is a compiler bug we will only
export it for the compiler that has this problem. (Intel Compiler on Windows)
The Intel compiler seems to inline the destructor of QObject (or at least
parts of it) even if it is declared virtual. Thus, it seems that the
destruction of the QScopedPointer<QObjectData> member is inlined into QtGui,
and that code will eventually call the destructor of QObjectData, and since
QObjectData was not exported from QtCore it would crash.
Reviewed-by: Olivier Goffart
|
| | | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0.
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The problem was that when using DeviceCoordinateCache for items in a scene, newly exposed areas were wrongly painted over the Pixmap in the cache, instead of blending into it.
Autotest included.
Task-number: QTBUG-657
Reviewed-by: Andreas
Reviewed-by: bnilsen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Harald Fernengel
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This mkspec has been replaced by linux-g++-maemo.
Reviewed-by: Harald Fernengel
|
