| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
As of commit bc82db, show()ing a native child widget causes a panic
on Symbian. The panic code (WSERV-10) indicates that Activate() is
being called on an already-active graphics context.
This test case reproduces the defect.
Task-number: QTBUG-7960
(cherry picked from commit 33aa8f4a035c1ce9231b40844e6e0793205d12aa)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit bc82db did not correctly handle native child widgets.
Consider the case when we have a top-level widget A with a native
child widget B. When QSymbianControl::Draw() is called on the
control corresponding to B, the following occurs:
1. The inExpose flag is set in B's QWExtra structure.
2. The call to syncBackingStore() results in a call to
QWidgetBackingStore::flush(), passing default parameters.
3. Because no target widget was passed to flush(), this
function selects the top-level widget (A) as the target for
the flush operation, passing A as the first argument of
QS60WindowSurface::flush().
4. QS60WindowSurface::flush() checks the inExpose flag from A's
QWExtra structure, finds it to be false, and proceeds to
call DrawNow() on A's control.
Because QSymbianControl::Draw() uses the default graphics context,
this context is shared between controls. This means that the DrawNow()
call in step 4 causes a WSERV-10 panic (Activate() called on an
already-active) graphics context.
This patch moves the inExpose flag from B's QWExtra into A's QTLWExtra,
with the result that the call to DrawNow() in step 4 is suppressed.
Task-number: QTBUG-7960
Reviewed-by: axis
(cherry picked from commit 46df42af1a25fd06247bb96d9e0bf24bf19defe8)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
(cherry picked from commit b37ac454832a23c17418f5ebca8928b63fe02289)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
For graphics systems that use EGL surfaces in the backing store
destroying the surface does not guarantee that the memory is
immediately freed because this command does not cause a flush. This
implies that a manual flush is instead needed. We do this in 2 places;
the first is when the surface is destroyed due to a visibility changed.
The second case is just after the window has been destroyed. At this
point the backing store has already been deleted so the deletion of
both the surface and window can happen atomically in WSERV.
Task-number: QT-2506
Reviewed-by: Iain
(cherry picked from commit 91e236022acd79dfbc4aef9e30edb4d1aeb2685c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The window surface must be deleted while the window is valid because on
some graphics systems a notifcation is sent to the window when the
surface is released.
This fix is also an optmization as we no longer process any backing
store requests while deleting the top-level. Previously it would
handle requests from the window itself and all its children.
Task-number: QT-2513
Reviewed-by: jbarron
(cherry picked from commit 34f1758428282a327c12b0d8040061c1f67ecc7f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When doing a full update of a parent item, by setting one of these flags,
QGraphicsItem::ItemIgnoresTransformations | ItemClipsChildrenToShape |
ItemIsSelectable, the child items that were transparent would not be
shown when setting their respective opacity to 1.0
We just need to set the ignoreOpacity flag when setting opacity to 0.0.
This avoids propagating this flag to the child items when it's not
needed.
Task-number: QT-2653
Reviewed-by: bnilsen
(cherry picked from commit 08c649e6a81ab13d0c7db6aa1b480ed149e3f770)
|
|
|
|
|
| |
Reviewed-by: Trust me
(cherry picked from commit fd12fbcf332878ab6a5b6ef8f09804b8598faced)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Problem description: normalGeomerty lost during showFullScreen
1. Reported problen was due on void QSymbianControl::PositionChanged()
over write top->normaGeometry on every position change. As fix
top->normalGeometry is moved to new rect:s top left only when
widget windowState == 0.
2. Also made some new qwidget auto tests. Refactored s60 side
setWindowState to be more readable. Minimized window state now
hides window decoration.
QApplication & QWidget autotest run on emulator and tested on
s60 5.0 hw using attached application.
http://bugreports.qt.nokia.com/browse/QTBUG-6231
Task-number:QTBUG-6231
Merge-request: 2256
Reviewed-by: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
(cherry picked from commit 79fb890a4f2a13cc0f21e92f5b2a6e10af1430b4)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
| |
We want to discard all update requests when we there's a full update
pending. The problem was that 'updateAll' was reset too early causing
update requests to fall through. To prevent this from happening we
reset 'updateAll' right before the items are actually painted.
Auto-test included.
Task-number: QTBUG-6956
(cherry picked from commit dda8a57c085216db609f822837c50bae38006b4e)
|
|
|
|
|
|
|
|
|
| |
Commit: dda8a57c085216db609f822837c50bae38006b4e
We don't want to reset 'updateAll' at that point, for the same reason as
mentioned in the above commit. More details in the task.
Task-number: QTBUG-6956
(cherry picked from commit 39bbc477e418d4d34c2f44fd10e76950a1ae781d)
|
|
|
|
|
|
|
|
|
|
|
| |
When building for ARMV6 with abld toolchain in Symbian, qtmain.lib
ends up missing some symbols that are required to link it against
GCCE apps. This happens because --dllimport_runtime compiler
option is missing in ARMV6 builds of qtmain.lib.
Task-number: QTBUG-7952
Reviewed-by: axis
(cherry picked from commit 95a095c69973081b66782e83fccd54ba15ca0b71)
|
|
|
|
|
|
| |
Task-number: QTBUG-8012
Reviewed-by: Iain
(cherry picked from commit 245295435f40b663fc164165ec788d8872e91624)
|
|
|
|
|
|
|
|
|
| |
Only remove dependencies that are known to cause unncessary warnings
from pkg files when patching them with patch_capabilities.pl script.
Task-number: QTBUG-8018
Reviewed-by: Janne Koskinen
(cherry picked from commit 5f887ce23a38fc6b9f395593a4f7ce1de5b80e8d)
|
|
|
|
|
| |
Task-number: QTBUG-8024
(cherry picked from commit 169279fa29f9a5afeb079729c9aec3cffbf81811)
|
|
|
|
|
|
|
|
|
|
|
|
| |
On Symbian the icons which are passed to softkeys, i.e. to actions with
softkey role, need to use pixmap alpha channel instead of mask. Otherwise
S60 CBA framework fails to create 50% transparent pressed down mask for
softkey icon.
Task-number: QTBUG-7314
Review-By: Sami Merila
(cherry picked from commit 95012c3ca7ef52ea8f2a2ecb67987b8575758987)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The logic for resolving the icon size in landscape mode for S60 5.0
(5800XM) is somewhat fragile, but better way is not yet know.
Also the 50% transparent mask what CBA implementation tries to create
for pressed down CB Abuttons fails for some reason. When button is
pressed down there are drawing artifacts in softkey images.
These issues will be tried to resolve with later commits
Task-number: QTBUG-7314
Review-By: Sami Merila
(cherry picked from commit 94abb3ee93aa09f79640e14fed89b286c57ce05c)
|
|
|
|
|
|
|
|
| |
available.
Task-number:QTBUG-7783
Reviewed-by:Justin McPherson
(cherry picked from commit 3108f02f35685bd57486e198277c600e09d98b13)
|
|
|
|
| |
(cherry picked from commit 3e6b22f138ad5b592dedbca99f91fdf612f20cea)
|
|
|
|
|
| |
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit d950a35334dda4620a138914c8d8198da670b2dd)
|
|
|
|
|
|
|
|
|
|
| |
Regression introduced by QTBUG-5824 change
6809bd020e3307324e136707f32f6f17f77b9591. Do not generate
setCentralWidget() for Qt3Support toolbar/dock widget classes.
Reviewed-by: ogoffart <olivier.goffart@nokia.com>
Task-number: QTBUG-7612
(cherry picked from commit 3c991df1681471cbfb737f6bed0c679e5ca67aa9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix bug where all target types, including apps, plugins and static
libraries were getting DEFFILE statements - now it's just libraries that
get it.
Fix bug where duplicate DEFFILE blocks were being added to projects that
manually specified their own DEFFILE - this now tests for the qmake
variable "defBlock" being set, and doesn't add additional DEFFILE
statements if it is.
NOTE: This means that adding DEFFILE statements to MMP_RULES
manually should be done by creating a variable called defBlock, and
adding that to the MMP_RULES (ie. MMP_RULES += defBlock)
Fix bug in configure.exe, where using -nokia-developer for Windows builds
would warn about Symbian DEF file usage (or lack thereof)
Reviewed-by: Janne Koskinen
Reviewed-by: Jason Barron
(cherry picked from commit 3569038ffec0c133ff29f80d506f334cc0f2ddb3)
Conflicts:
configure.exe
|
|
|
|
|
|
| |
Task-number: QTBUG-7037
Reviewed-by: Kim
(cherry picked from commit 381f5ae82cccec3774b68674b4c0e782e9f49f6f)
|
|
|
|
|
|
|
|
| |
Rework the previous commit a bit and include caching of image sizes.
Task-number: QTBUG-6696
Reviewed-by: Kim
(cherry picked from commit 6d1d425e219b0a5e03603f7d708cd740b7d3a3f4)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
(cherry picked from commit 38d31452b3cafd738c215b5686bf3ff95c1d27d6)
|
|
|
|
| |
(cherry picked from commit 5ddcf96b8339850d1f84db9f487ac15a1ed3364a)
|
|
|
|
| |
(cherry picked from commit 551575ae14de1c80712478ba07fd26c7cccec322)
|
|
|
|
| |
(cherry picked from commit db82dda4ae3672844f7637394bf9a403e7c4f4b3)
|
|
|
|
| |
(cherry picked from commit b52e4ac1dfcce317872d9104142c026951a29145)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 88a3be84f9a1cb235a8e3a9b25df7763646166b6)
Conflicts:
dist/changes-4.6.2
|
|
|
|
| |
(cherry picked from commit 92638ff2f459a8f7151385a192317e9ec91d9e66)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
horizontal scrollbar"
This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d.
This shown to cause more problem than it solved
Also update the changelog
Reviewed-by: Thierry
(cherry picked from commit d53315d30b38352db11063096ee3867a40bdc234)
|
|
|
|
| |
(cherry picked from commit 7d4ef9167249df5f00831dc07e57705eb1ddd22a)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 85578c6c37d9e4eb0da888937b20ba93a26d8805)
Conflicts:
dist/changes-4.6.2
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 96a169ac3f235433906d58ac0e4c613f51c21bf3)
|
|
|
|
| |
(cherry picked from commit 264f4451667e7da90e63cf87a2b4a6eb72a14d3b)
|
|
|
|
|
| |
Reviewed-by: trustme
(cherry picked from commit a9ffa944f8599db0559e9d07509a3778f49bbc2a)
|
|
|
|
| |
(cherry picked from commit d5a3866d20507967e14ed34930f08ce6248000e5)
|
|
|
|
|
|
|
| |
Mostly DirectFB.
Reviewed-by: TrustMe
(cherry picked from commit bcd979230af769b49a1e3fdb1c9e1103ce2348de)
|
|
|
|
| |
(cherry picked from commit 0f92406252b9d288ef8ebbefc15e66d0ce01f46c)
|
|
|
|
|
| |
Added bug 7044 to log.
(cherry picked from commit 89377dc65ea505de568bb7243396ae260f435438)
|
|
|
|
|
|
| |
Task-number: QTBUG-7514
Reviewed-by: Kim
(cherry picked from commit 94b3918fb52858064811c4993dac6392d0043b24)
|
|
|
|
|
|
|
|
| |
Now we check that and skip it from the tab list. Auto-test included.
Reviewed-by: leo
Task-number: QTBUG-7532
(cherry picked from commit 94f5f21ac88de0d940d6ac27d222f1ef8e66d939)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes quite a lot of issues:
* QtOpenGL only registered qpixmap destruction hooks on X11 and
those only cleanup the EGL/GLX surface, not the texture object.
* The QPixmap destruction hooks were only being called from the
QPixmap destructor. However, this means when a QPixmap is assigned
to another QPixmap, the hooks don't get called.
Task-number: QTBUG-7647
Reviewed-By: Samuel
Reviewed-By: Trond
(cherry picked from commit 9e95ce2a68ef167e17dccc5789cbf3bf74712280)
|
|
|
|
|
|
|
|
| |
Regression since b4d642e639eabde5d72a4
Task-number: QTBUG-7737
Reviewed-by: Gabriel
(cherry picked from commit cc585886ba9da17064a7fc858f5d717967da6e85)
|
|
|
|
|
|
|
|
|
|
| |
Destroying QPixmaps after the QApp destructor will leak native pixmap
objects on X11, and it's a general rule that all GUI objects must
be destroyed before the QApp destuctor is called.
Task-number: QTBUG-7746
Reviewed-by: Kim
(cherry picked from commit 4a5e81f5320daa82352b13e670718998b0d2d23b)
|
|
|
|
|
|
|
|
|
| |
for one, it just added visual noise.
second, it did not respect the color scheme, which made it unusable with
light-on-dark colors.
Task-number: QTBUG-7778
(cherry picked from commit b0e4af35ec8ddb5e7bfa658f916fbf29caa5a550)
|
|
|
|
|
|
|
|
|
|
| |
The boxes demo assumed that the current GL colour was the default white,
but the GL2 paint engine set it to black. Fixed by resetting the colour
to white in resetGLState().
Task-number: QTBUG-7779
Reviewed-by: Trond
(cherry picked from commit 787824cb4add4d45a0e90fd736a54e75fa048475)
|
|
|
|
|
|
|
|
|
| |
Disable vertex attribute arrays in the GL2 paint engine when
calling QPainter::beginNativePainting() and QPainter::end().
Task-number: QTBUG-7781
Reviewed-by: Trond
(cherry picked from commit afe0f17eb5974adbedd1bc1f2fcd98459d92df47)
|