| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add new QSysInfo::symbianVersion() enums
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add new enums for future Symbian platforms and fix the docs of
existing ones.
Task-number: QT-4593
Reviewed-by: Sami Merila
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QDesktopServices::openUrl() doesn't handle URL encodings correctly
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
I think this is a problem with the USE_SCHEMEHANDLER version of
handleUrl() in qt/src/gui/util/qdesktopservices_s60.cpp. It calls
url.toString() which removes percent encoding. I think url.toEncoded()
should be used instead.
Task-number: QTBUG-18772
Reviewed-by: joao
|
| | |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Build fix for transition effect support on S60 5.0.
Make EGL surface transparency working on Symbian.
Splitview flag should also be updated to inputcontext
QGraphicsView with vertical scrollbar flickers when splitview opens
Splitview: opening a context menu should not re-position of focusItem
Trigger fullscreen transition effects properly on app exit.
Do not use SetSurfaceTransparency() on raster.
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QT-4718
Reviewed-by: TRUSTME
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When the hardware is capable enough, setting WA_TranslucentBackground
will not lead to falling back to raster, but will continue using
OpenVG or OpenGL based rendering. However this needs an alpha channel
which was not requested previously. This patch corrects it.
Task-number: QT-4729
Reviewed-by: Jani Hautakangas
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently splitview support is defined in exported global private method.
There is no guarantee that input context is created, or updated when
the API is called. This is problematic, since the client need to find
a correct place and time when to call the API.
As a change, update existing input context when the API is called.
Also, take into account the splitview flag when updating input context.
This ensures that client can enforce the flag use correctly.
Task-number: QTBUG-18715
Reviewed-by: Guoqing Zhang
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Do windowstate change to fullscreen inside updateEnabled(false) -
updateEnabled(true) guard block to avoid flickering of screen
area, when keyboard opens in splitview.
In worst case, screen is drawn three times:
- resize the content area to fit into splitview
- change windowstate to fullscreen
- ensure visibility of the focusitem by scrolling the view
Now, all these happen inside one "update".
Task-number: QTBUG-18737
Reviewed-by: Guoqing Zhang
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When splitview is open and user long taps an text input item,
a context menu is opened. This leads to some drawing operations on
splitview implementation, even though these should be skipped.
The focusItem might even be re-positioned into incorrect position
due to the failure.
As a fix, check if the focusItem is already positioned correctly
and avoid doing anything when it already is.
Task-number: QTBUG-18738
Reviewed-by: Guoqing Zhang
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Avkon calls BeginFullScreen() and EndFullScreen() to trigger the
fullscreen system transition effects for application exit, however
the calls are made too late for Qt apps because the widgets are
already destroyed. Instead, the effects are triggered explicitly
from Qt, before closing the widgets, or from aboutToQuit, whichever
comes first.
Task-number: QT-4718
Reviewed-by: Jani Hautakangas
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When raster graphics system is forced and the HW was capable enough,
we still tried to use SetSurfaceTransparency() on the RWindow to
enable semi-transparency, which is wrong as it only works for
windows that have a separate surface.
Reviewed-by: Jani Hautakangas
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Fix so concurrent jobs produce the correct model results
Fix uninitialized variable.
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust-me
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I7371d5c2f76254e6746d5a86874a045fc6aec32d
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When resolving unqualified attached properties, we should use the scope
object, not the context object. Otherwise they will always resolve to the
root object of the context, regardless of where they are written.
In this example,
QtObject {
id: root
QtObject {
id: me
property int a: AttachedObject.x
}
}
the attached object should be loaded on the "me" object, not the "root"
object.
Change-Id: I386f886f62df7b8020c3ff703cdfc891d5739713
Reviewed-by: Martin Jones
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Symbian.
Task-number: QTBUG-18764
Reviewed-by: kkoehne
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make the name less ambiguous, especially on Symbian were all .dlls end
up in sys\bin.
Reviewed-by: Pawel Polanski
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Protocol might still be in the process of processing messages when
disconnect() is called (e.g. due to an invalid package). Therefore delay
it's deletion until the next event loop runs.
Reviewed-by: Christiaan Janssen
Task-number: QTBUG-18771
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Concurrent jobs sometimes modified another job's results as results
were stored in member variables and modified without locks. This
change removes the use of member variables for the current job, and
uses QAtomicInt for the incremented job ids.
(Regression from 4df66da8f9e5a9f3c981c6c60254899146dd1cc0)
Task-number: QTBUG-18266
Change-Id: Ia6783e9d17603e0ff5ccd40d8cc992bdc2d3f0e9
Reviewed-by: Charles Yin
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ieebfc72cf9b31c9d2522487ed7cd860f060ef0be
Task-number: QTBUG-15877
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add pincharea.qmlproject file for PinchArea example.
Moving contentY by large values in List/GridView is slow
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I9d3129be4d03904805e53489c1117104e08ce860
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We needed to create/destroy every delegate between the current position
and the new position. Now we estimate element at the new position and
just create the elements from that item.
Change-Id: I9da1354cbadb4e44fafc1a0bee619d058d1e06a2
Task-number: QTBUG-14974
Reviewed-by: Bea Lam
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit cursorRectangle property.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Translate the cursor rectangle from control coordinates to painting
coordinates rather than the other way around, ensure the cursor
delegate is also translated, and update the cursor rectangle, cursor
delegate and micro focus when the preedit cursor changes position.
Change-Id: Iac7a87f7fb965d5f56d059d8f4b97feef8b47789
Task-number: QTBUG-18515 QT-4827
Reviewed-by: Martin Jones
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix to 'QImage convertToFormat doesn't work correctly'
Predictive Text causing app to crash after repeated edit attempts
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
OpenVG paint engine tries to use vgWritePixels shortcut
whenever possible to optimize rendering performance. The
check 'canVgWritePixels' failed to map formats correctly
and resulted to incorrect return value.
Task-number: QTBUG-18682
Reviewed-by: Jason Barron
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Splitview changes cause application to crash, since the cancellation of
FEP transaction is not notified to the native side. This leads
the native side and Qt to be not in sync.
Task-number: QT-4879
Reviewed-by: Guoqing Zhang
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Have the backing store destroyed also in special Symbian scenarios.
Use FixNativeOrientation on Symbian when the application wants it.
QS60Style: itemview item with checkbox and text is drawn incorrectly
Revert "Have the backing store destroyed also in special Symbian scenarios."
Add focus frame support in style sheet
Two QListView autotests do not pass on Symbian^3 releases
tst_QStyle::drawItemPixmap test case fails on Symbian^3
Add the auto detection for OpenVG in configure
Add focus frame support in stylesheet
Make QS60Style to support new Tab graphics in new Symbian releases
GraphicsView is not reset if focusItem is not set when keyboard closes
Check the validity of qt_desktopWidget before dereferencing
Labels are not visible in dialogs with all themes (part2)
Labels are not visible in dialogs with all themes
Enable webkit for symbian-gcce in configure
Enable webkit build for the makefile build system with gcce
Add the rules for gcce in do_not_build_as_thumb.prf
Correct some parameters for the makefile build sytem, armcc and gcce
Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system
Do not unnecessarily draw application twice in landscape
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The backing store tracker's registerWidget and unregisterWidget
functions are called when EPartiallyVisible and ENotVisible events
come from WSERV. However if an application sends its window group
to background right after caling show() and before entering the
event loop, there is a chance that all the application will receive
is an ENotVisible event, leading to calling unregisterWidget() without
a previous registerWidget(). In this case the backing store was
not destroyed and the application was consuming GPU memory even while
it was staying in background. This patch ensures registerWidget() is
called always before unregisterWidget() in the Symbian-specific
event handler for ENotVisible, and replaces the previous patch,
a12d41076919a133e63de63dff5c1a131a0564e4, which caused regression
in autotests.
Task-number: QTBUG-18493
Reviewed-by: Gareth Stockwell
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Applications can request the usage of RWindow::FixNativeOrientation()
by setting the new Qt::WA_SymbianNoSystemRotation attribute for their
fullscreen top-level widget (which in practice will either be a
graphics or declarative view). This will fix the underlying EGL
window surface and the QWidget dimensions to the dimension of the
native orientation of the device (typically portrait). The default
auto-rotation can be left enabled, however it will be up to the
application to rotate the drawing. Global notifications, VKB, etc.
will still appear in the proper orientation. Another benefit is
improved performance in the non-native orientation.
Task-number: QTBUG-17742
Reviewed-by: Jason Barron
Reviewed-by: Jani Hautakangas
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style deduces incorrectly when itemview only contains checkbox.
This is minor, yet highly annoying bug that prevents highlighted
itemview item from showing its content with themes that have opaque
itemview item highlight (highlight covers the text that is underneath).
As a fix, check itemview item text and icon content before declaring
it as "checkbox only".
Task-number: QTBUG-18694
Reviewed-by: Tomi Vihria
|
| | | | |
| | | |
| | | |
| | | | |
This reverts commit a12d41076919a133e63de63dff5c1a131a0564e4.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-16207
Reviewed-by: Sami Merila
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
tst_QListView::taskQTBUG_2678_spacingAndWrappedText() fails because:
QS60Style adds to the itemview item content size margins and empty
space, which shouldn't be part of the content size.
As a fix, remove these.
taskQTBUG_435_deselectOnViewportClick() fails because:
Sending a click to a selected itemview item, when it should be sent
to below that specific one. It was using hardcoded (center + 20) and
autotest assumed that this would be outside of first item.
In S60 with touch support, the itemview items are rather tall
(49 pixels). As a fix, autotest now uses calculated value, which
ensures that click is sent to outside first item.
Task-number: QT-4810
Reviewed-by: Tomi Vihria
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The autotest assumes that created QPixmap are exactly same irregardless
how the pixmaps were created. However, there is no guarantee that
pixmaps that look the same (i.e. in this case green rectangles)
are "same". QPixmap is platform dependent and might have e.g.
optimized format in some of the platforms.
Task-number: QT-4805
Reviewed-by: Jani Hautakangas
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-18647
Reviewed-by: axis
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-16027
Reviewed-by: Sami Merila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In SR.11 there is a new theme graphics (with separate ID) for
TabWidget tab shapes. Also, shapes are no longer set overlapped,
but are side-by-side without any gaps.
Earlier releases still use the existing graphics with overlapping.
Task-number: QT-4762
Reviewed-by: Miikka Heikkinen
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTMOBILITY-1494
Reviewed-by: Gareth Stockwell
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When splitview closes (i.e. keyboard is dismissed), application's
graphicsview containing the input widget (focus item) is reset back to
original graphicsview transformation.
As a fix, resetTransform is always called, when rootItem is found
from graphicsView.
Task-number: QT-4858
Reviewed-by: Guoqing Zhang
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added include to the previous fix to prevent compilation issue.
Task-number: QT-4559
Reviewed-by: Tomi Vihria
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style uses different theme background for dialogs. However,
labels use just one color irregardless of background texture.
Therefore, in certain themes, this might produce an issue, where
foreground color (label) is not visible from background.
To fix this, set the label color to correct theme color when
label is contained within a dialog.
Task-number: QT-4559
Reviewed-by: Tomi Vihria
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: axis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-18484
Task-number: WEBKIT-57841
Reviewed-by: axis
Reviewed-by: Janne Koskinen
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: axis
|
