| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (201 commits)
Fix an issue with the error signal in a callWithCallback not being
Add skeleton changes file for 4.6.3.
Fixed compiler warning about making the same class a friend twice
New test cases for the QScriptString.
Fix a deadlock in kqueue implementation of QFileSystemWatcher
Don't crash when QTouchEvent is accepted but not handled by a
QNAM HTTP: Unify socket EOF handling a bit
doc: Added \section1 about serializing operators for Qt collections.
Update the composition demo at 60 FPS instead of at painting rate
Replace the inline blend function by #define
Fix for using QContiguousCache with default constructor or capacity=0
Correctly mark QGraphicsScene::drawItems() as obsolete
Compile fix on Mac with 10.5 sdk.
QTestLib: don't crash if data tag requested, none available
Implement the blend functions with SSE2
doc: Added some since version information.
Ignore touch and gesture events when excluding input events
Implemented GraphicsView Panel support for gestures.
doc: Fixed several typos.
Add MSVC-specific expected failures for JS test suite
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
delivered queued.
Since we emit the signal while the locks are in place, we have to have
queued delivery.
Task-number: QT-760
Reviewed-by: Trust Me
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QT_BUILD_KEY for Symbian.
Partial upgrade packages for QtCore and QtGui
Fixed missing repaints on S60 3.1.
Build break fix for QS60Style.
QS60Style: Branch indicator in tree view is misplaced
Compilation error fix: missing comma in enum list in QS60Style
Scroll bar handle/groove ends are squeezed (in nHD resolution)
QS60Style draws drop area as a black rect
Remove scrollbar context menu from QS60Style
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Symbian builds didn't set build key properly, so it defaulted to
a Windows key. This caused problems with loading plugins.
Task-number: QTBUG-7942
Reviewed-by: axis
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When debugging or benchmarking changes in QtCore / QtGui, it is
inconvenient to reinstall the whole of Qt.
This allows 'make sis' to generate a partial upgrade sis files,
which can be installed on top of an existing Qt installation.
This relies on binary compatibility, so you should be using def files.
Self-signed partial upgrade can only install on top of self-signed Qt.
Reviewed-by: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The bug happened when a paint event came in from Symbian, but the
painted area was bigger than the exposed rect being passed in by
Symbian. In these cases we would lose updates to the area outside.
Fixed by calling Draw() once more if we detect that we painted a
larger area to the backing store.
It is still a mystery why this worked on 5.0 though... :-P
AutoTest: QWidget passed
RevBy: Jason Barron
Task: QTBUG-8200
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Very recent change for QS60Style breaks compilation of the style for
3.1. This is due to that style refers to a skin item ID that is not
existing on 3.1 environment. Fixed by referring to the skin ID with
its internal values.
Task-number: QTBUG-8193
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix for QTBUG-7258 make itemview margins larger. This broke the
treeviews visually, as indicators are not shown in correct places.
Now, indocators are placed correctly for treeviews as well.
Task-number: QTBUG-7995
Reviewed-by: Alessandro Portale
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix for QTBUG-8193 introduced a new enum value into s60style.
Unfortunately, the comma after the value didn't make it into the fix
itself. Adding the comma to allow compilation of style.
Task-number: QTBUG-8193
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style uses non-square area for scrollbar end graphics areas. It
then tries to scale the areas to make them look like native graphics
(and keeps the width-height ratio), thus squeezing them.
Change style so that scrollbar end areas are squares, just like in
native graphics they are.
Task-number: QTBUG-7996
Reviewed-by: Alessandro Portale
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When Drag-n-Dropping elements in itemviews QS60Style draws drop area
as a black rect. Change this so that native graphics are used instead.
This change only affects touch-devices as non-touch 3.x devices
do not have the native graphics defined. In 3.x non-touch devices,
style still uses QCommonStyle to draw the DropArea.
Task-number: QTBUG-8193
Reviewed-by: Alessandro Portale
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently style does not forbid scrollbar context menu, so by default
long pressing over the scrollbar widget shows the context menu. This is
not according to 'S60-style', so from now on the stylehint
SH_ScrollBar_ContextMenu returns false.
Task-number: QTBUG-8194
Reviewed-by: Alessandro Portale
|
| |_|/
|/| |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Thiago Macieira
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
New behavioral checks for an invalid QScriptString and for not a number
QScriptString.
Reviewed-by: Kent Hansen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When adding and removing lots of files, the kqueue implementation's
pipe between the worker thread and the main interface would fill up,
causing the thread adding/removing files to block even though the
worker thread was no longer running.
The kqueue interface gives us information about how much data is
available on the pipe (the data member of the kevent struct), so we
should use this to make sure we always empty the pipe. We then iterate
over all the command bytes and make sure we interpret them correctly.
Reviewed-by: Prasanth Ullattil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QGraphicsItem
After propagating QEvent::TouchBegin, if there is no item that has
accepted and handled the event, we must remove the touch point from our
data structures.
In this situation, QGraphicsScene will ignore the TouchBegin, as will
QGraphicsView, and QApplication will respond by not sending any more
touch events to the view/scene/item. This means our logic for handling
TouchPointReleased points will never be called (and the QGraphicsScene's
itemForTouchPointId and sceneCurrentTouchPoints state will be
incorrect).
Reviewed-by: Denis Dzyubenko
Reviewed-by: Marius Storm-Olsen
|
| | |
| | |
| | |
| | | |
Reviewed-by: Peter Hartmann
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The Composition demo was updating as fast as the possible
(update was called in the paint event). This is very CPU
intensive, making the demo look slow on slower computer.
The update is now made with a 16ms interval.
Reviewed-by: Gabriel de Dietrich
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some compilers do not inline the functions, which is a problem
because the number of arguments exceed the limit for SSE,
and because it is a lot slower for those low level functions.
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Peter Hartmann
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Since the \obsolete was not at the beginning of the function
documentation it was not showing it correctly
Reviewed-by: TrustMe
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QtWebKit with THUMB again
This restores the library size and memory consumption.
Reviewed-by: Janne Koskinen
Reviewed-by: Iain
(cherry picked from commit 86d724590212825ba6db87da75117911880a30a8)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Old link was defunct as the version it pointed is no longer available.
Task-number: QTBUG-8134
Reviewed-by: TrustMe
(cherry picked from commit 898a85964830ac17e44675b75c6584866bcf767a)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Rev-By: TrustMe
(cherry picked from commit 709a3a4b96f4cc483e63958494adbc5efdf6c57d)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The GL 2 pixmap filter uses Indexed8 images in the drop shadow case.
Reviewed-by: Tom Cooksey
(cherry picked from commit f04f014835e9fd4c41e9113e8036ba71ff884ae9)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
glColor4f is not defined in OpenGL ES 2.
Reviewed-by: Trond
(cherry picked from commit 88c4000c21be7af37bc490a2edd9d1f481b3a862)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We need to set the paintedViewBoundingRectsNeedRepaint flag when an item
becomes visible again because when the item has opacity 0.0 the
paintedViewBoundingRects struct can get set as outside of viewport, so the
next time the item is set to visible again we need to diregard this cached
data (otherwise the item will not be updated).
Task-number: QTBUG-7714
Reviewed-by: bnilsen
(cherry picked from commit 37f1aec1a4e71a7102e8cd2e2908c8d3be7e29f5)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This should unify the error constant used along the code and enforce qreal
to avoid unnecessary double conversions.
Reviewed-by: bnilsen
(cherry picked from commit 519760c4256997f26c039cb4b047c6207470b54f)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-8068
Reviewed-by: David Boddie
(cherry picked from commit b0c972dfd208411086b53ee2c2b0594ade3e2d10)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This copy of the installer doesn't work anymore.
Reviewed-By: TrustMe
(cherry picked from commit 707610b9f07ad96318e6d84f321588c060c0c294)
Conflicts:
tools/installer/batch/build.bat
tools/installer/batch/copy.bat
tools/installer/batch/delete.bat
tools/installer/batch/env.bat
tools/installer/batch/extract.bat
tools/installer/batch/installer.bat
tools/installer/batch/log.bat
tools/installer/batch/toupper.bat
tools/installer/config/config.default.sample
tools/installer/config/mingw-opensource.conf
tools/installer/iwmake.bat
tools/installer/nsis/confirmpage.ini
tools/installer/nsis/gwdownload.ini
tools/installer/nsis/gwmirror.ini
tools/installer/nsis/includes/global.nsh
tools/installer/nsis/includes/instdir.nsh
tools/installer/nsis/includes/list.nsh
tools/installer/nsis/includes/qtcommon.nsh
tools/installer/nsis/includes/qtenv.nsh
tools/installer/nsis/includes/system.nsh
tools/installer/nsis/installer.nsi
tools/installer/nsis/modules/environment.nsh
tools/installer/nsis/modules/mingw.nsh
tools/installer/nsis/modules/opensource.nsh
tools/installer/nsis/modules/registeruiext.nsh
tools/installer/nsis/opensource.ini
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Beginning with Qt 4.6, OS X 103 (Panther) is no longer supported.
(cherry picked from commit 9be25c3847bb90eb2a6cf9cd6d357e83b7ad89a2)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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)
|