| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
It was missing and not covered by the standard autotests, so its
missing was not detected for quite some time.
Task-number: QTBUG-8423
Reviewed-By: Shane Kearns
|
| |\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed crash in Phonon MMF backend during application shutdown
Fixed bitfield-related crash on Symbian WINSCW
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When running on WINSCW, the nativePaintMode variable was becoming
corrupted. The point at which this corruption occurs is unclear,
but it can be reproduced as follows:
1. Launch qmediaplayer
2. In the Phonon::MMF::DsaVideoOutput constructor, the
nativePaintMode flag is set to QWExtra::ZeroFill
3. Open a video clip
4. During start of playback, QSymbianControl::Draw is called on the
native control corresponding to the DsaVideoOutput object. This
checks the value of nativePaintMode; it does not match any of
the valid NativePaintMode values, so an assertion fails.
This crash does not occur on target, suggesting that the cause may
be an error in the WINSCW compiler. Although the C++ standard allows
bitfields to have boolean, integral or enumeration type, the latter
is not permitted by C99.
Neither increasing the number of bits allocated to nativePaintMode,
nor changing it position in the list of platform-specific bitfields
has any effect.
After making nativePaintMode into a normal field rather than a
bitfield, the crash no longer happens. Note that, since bitfields
must be kept together, nativePaintMode is moved to the end of the
structure.
|
| |/
|
|
| |
Reviewed-by: Eskil
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QInputContextFactory::languages implementation for Symbian.
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6851
Reviewed-by: Sami Merila
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Reverts using composition mode when using DeviceCoordinateMode cache.
Fix linking error
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Going back to always blitting the newly painted areas to the cache (and
not blending it like before). To avoid painting artifacts when the item
is rotated and when it uses DeviceCoordinateMode cache mode, the entire
cache is always repainted in that case.
Task-number: QTBUG-7863
Reviewed-by: trustme
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The #include "moc_qgraphicswidget.cpp" is superfluous and caused these
link errors:
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o:(.data.rel.ro+0x0): multiple definition of `QGraphicsWidget::staticMetaObject'
.obj/debug-shared-emb-x86_64/qgraphicswidget.o:(.data.rel.ro+0x0): first defined here
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o: In function `QGraphicsWidget::metaObject() const':
Presumably this only happens when you have a stale moc file sitting
around but it's a bug none-the-less.
Reviewed-by: TrustMe
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the spinbox is very tall considering its width (ratio 2:1), the
spinbuttons can easily hide the lineEdit when they are scaled up.
For example QSize(200, 100) QSpinBox does not have any lineEdit at all,
since spinbuttons are scaled up to be 100*100 squares and deployed
side-by-side.
As a fix, once spinbuttons occupy half of the total width of spinbox,
they stop growing. For very tall spinboxes, spinbuttons are deployed
one top of the other, to make the lineEdit bigger.
Task-number: QTBUG-9321
Reviewed-by: Alessandro Portale
|
| |/
|
|
|
|
|
|
|
|
| |
Due to incorrect initialization of CFbsBitmap, graphic frames (9-part,
or 3-part ones) are drawn with white non-transparent rect below them.
Initialization corrected.
Task-number: QT-3185
Reviewed-by: Janne Anttila
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Correct documentation for ObjectReplacementCharacter and ReplacementCh.
Fix for submenu placement for QMenus in Symbian.
Symbian event loop priority drop not used in Symbian^4
QMessageBox is smaller than native MessageBox
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for submenu placement for QMenus in Symbian.
Symbian event loop priority drop not used in Symbian^4
QMessageBox is smaller than native MessageBox
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-5992
Reviewed-By: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Messageboxes are smaller than native ones.
This is due to that native ones have a lot of empty space.
To fix this, we define a new custom pixel metrics that is the minimum
height of one text line messagebox (aka AknPopUp) on the native side.
Then we ensure that the QMessageBox is at least of this height.
Additionally we do some minor styling for QMessageBox:
- the corners graphics are now as rounded as on native side
- the font is set to match the native side
- the top margin space is doubled for dialogs, which is rather good
approximation of native side
Task-number: QTBUG-4875
Reviewed-by: Janne Anttila
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
No repaint is triggered anymore when setting the cache mode to
DeviceCoordinateMode when already using that mode.
Also added an autotest for checking repaints when setting cache modes.
Task-number: QTBUG-9391
Reviewed-by: ahanssen
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize QGraphicsEffect test on X11
Add a children private property needed for QML to support QGraphicsObject
Invalidate the cache of QGraphicsEffect if a child becomes visible.
Fix a crash when reparenting an item in QGraphicsView.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit adds a private property that QML can use to add children for a given
item. This is a custom list that calls a callback which actually reparent
the item instead of just appending in the list (otherwise it will mess up
the state of QGraphicsView). This is needed because childItems() is pretty
useless you get a list but if you append something on it then it adds
that into a copy. Also the children property is the default property
a concept used by QML.
Width and Height private properties has been added in order to support
better the integration with QGraphicsWidget in QML. The actual implementation
is in the private class of QGI and QGraphicsWidget reimplements it to return
the geometry. (In 4.7 QDeclarativeItem reimplements it too).
This change should be harmless everything is private.
Task-number:QT-2757
Reviewed-by:andreas
|
| | |
| |
| |
| |
| |
| |
| |
| | |
The effect might rely on a child to draw itself. So we need to redraw if
a child become visible or invisible.
Task-number:QTBUG-7843
Reviewed-by:janarve
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Before calling addItem we need to invalidate the depth otherwise if
someone call anything relating to sorting when itemChange is called
(because of the scene change for instance) then qt_closestItemFirst
for example can crash because of an invalid state.
Task-number:QTBUG-6932
Reviewed-by:janarve
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The pkg statements were generated in invalid order if user used
pkg_prerules to redefine languages supported by the pkg file.
Also made it possible to override dependency statements autogenerated
for Qt and QtWebkit, as these statements need to be user defined in
case of multiple languages.
Defining the following in .pro removes all dependencies from pkg rules:
default_deployment.pkg_prerules -= \
pkg_depends_webkit \
pkg_depends_qt \
pkg_platform_dependencies
Task-number: QTBUG-9279
Reviewed-by: Janne Anttila
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Compile fix
Changed Symbian pkg files to deploy from under epoc32
Remove internal custom pixel metric enums
Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01
Fixed S60 softkey implementation to use popup/modal dialog softkeys.
Fixed 'fullsreen with softkeys' mode not to expand under softkey area.
Fixed left softkey regression caused by 7829fe15 in Symbian.
QS60Style: Housekeeping
Custom pixel metric values cannot be inquired from outside the class
Adding custom pixel metrics requires cleaning and rebuilding of QtGui
|
| | |
| |
| |
| |
| |
| |
| | |
Commit 47902b7587d66c0941bacf08b31b8caae264f09a was missing one enum
rename in qs60style_s60.cpp
Reviewed-by: TrustMe
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously softkey implementation assumed that source for softkey
actions is focused widget or activewindow if there is no focused
widget. Since for example pop-up menu does not take focus immediately
in touch enabled devices, the underlying widget softkeys were visible
and usable when menu was open. This lead to problem that underlying
widget could be interacted via softkeys when popup menu was open.
For example as reported in QTBUG-8688, it was possible to close the
underlying filedialog from which the currently active context menu was
launched. It was also possible to open "Options" menu of underlying
widget when context menu was open, leading to situation where several
context menus could be launched via "Actions" item of "Options" menu.
This was reported as an issue: QTBUG-6167
In addition when user started navigating in context menu via keypad,
the menu got focus and softkeys changed to partially correct. Only
partially correct, since context menu "Select" action and "Options"
action had same priority and both associated to LSK. In addition the
context menu action "Cancel" associated to RSK was set to invisible,
meaning that it was also disabled and appeared in sofkeys as dimmed.
All of these issues were fixed by making making the popup and modal
dialogs highest priority softkey source. In case the focused widget
is inside popup or modal dialog it is being used as an initial softkey
source. In addition the softkeys created with
QSoftKeyManager::createAction or QSoftKeyManager::createKeyedAction are
now by default invisible i.e. not visible in context menu and have
special property set to make them still normally enabled in softkeys.
Task-number: QTBUG-6167
Task-number: QTBUG-8688
Task-number: QTBUG-9144
Reviewed-by: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
availableGeometry returns incorrect area after cba is made invisible,
it seems that this happens because CAknToolbar is not made invisible.
Fixed the problem by reverting back to SetExtentToWholeScreen usage
when the widget is really fullscreen, i.e.
Qt::WindowSoftkeysVisibleHint is not set.
Task-number: QTBUG-9038
Reviewed-by: Miikka Heikkinen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Dialogs are always responsible for setting all of their softkeys by
themselves, that's why this qmenubar hack can be removed.
When "Options" menu support was moved from QMainWindow to QMenuBar,
it appeared that some dialogs did had "Options" in LSK even it should
have had dialog specific softkey.
This commit removes the year old hack made to qdialogs softkey
implementation.
Reviewed-By: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use only public custom pixel metrics. Remove the internal enum
and switch usage of those to public enum values.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Remove unnecessary #include, remove unnecessary integer, correct
spelling issues in comments and replace tabs with spaces.
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is due that
a) custom values are internal and not exposed
b) values use different format - they are indexes for internal data[]
table and not according to QStyle documentation for pixel metrics.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is due that the size of the pixel metrics table is stored in some
object file and the file is not updated, even if we increase the table
size integer. Removing direct calls from internal methods to member
variable data[] removes the need to do whole rebuild when adding
values.
Relates to task #9247.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc update for QSpinBox::textFromValue
|
| | | |
| | |
| | |
| | |
| | |
| | | |
We remove the group separator so the docs should reflect this.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The focus frame was drawn with a low opacity. That was intended meant
to increase aesthetics but in reality decreased usability. Now,
the opacity is higher. But still with a difference between navigation
mode and edit mode.
Task-number: QT-826
Reviewed-by: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QFocusFrame drawing code in QS60Style incorrectly assumed that
PM_LayoutSpacing is always equal to PM_FocusFrameMargin. When these
values diverged, the focus frame broke as described in task QTBUG-8036.
The fix makes the drawing more robust. The focus frame width is never
thicker than PM_LayoutSpacing and PM_FocusFrameMargin. And instead of
drawing a roundRect with calculated pen width, we are now filling a
roundRect. That makes the focusFrame more apparent.
Task-number: QTBUG-8036
Reviewed-by: Sami Merila
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix #ifdef logic for Symbian conversion functions in QVGPixmapData.
Fixed table formatting in QSound documentation
|
| | |/
| |
| |
| |
| |
| | |
Added the missing \row tag
Reviewed-by: TrustMe
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Recommit 1ebeb971d3382aec0fff927
Fixed inconsistent test naming.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 725c2c29c192349016b1332824a7716bbb992f31 which reverted
the original commit because of a test failure on qws. This recommit adds
a test for whether the metrics from QFontEngine::boundingBox() are valid,
which is required for the bearings to be calculated. This test was also
in the original logic.
|
| |/
|
|
|
|
|
|
|
|
|
|
| |
In QS60Style, all itemviews should indicate selection/multiselection
with tick mark. Unfortunately it now uses object casting to QListView
currently to check the viability of widget to have tick mark. Thus,
it fails for QTreeViews and QTableViews.
Changing object casting to QAbstractItemView to support all item views.
Task-number: QTBUG-9212
Reviewed-by: Alessandro Portale
|
| |
|
|
|
|
|
|
|
|
|
| |
QS60Style asserts that a given index is correct when setting theme
colors. Unfortunately it uses less-and-equal-to operator ('<='), which
is incorrect. It should use less-than ('<')operator, otherwise the
assert fails when index is equal to number of items in the color
table.
Task-number: QT-3078
Reviewed-by: Alessandro Portale
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix QTabBar scroll button arrow position in Windows mobile style
Revert "Optimize getting bearings of a glyph on Windows for true type fonts"
stabilize tst_QAccessibility::comboBoxTest
Better handling for NOTIFY in QGraphicsWidget regarding geometry changes
Add NOTIFY to size property so QML bindings are working fine.
Implement Q_PRIVATE_PROPERTY that allows you to declare properties
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix QTabBar scroll button arrow position in Windows mobile style
Revert "Optimize getting bearings of a glyph on Windows for true type fonts"
stabilize tst_QAccessibility::comboBoxTest
Better handling for NOTIFY in QGraphicsWidget regarding geometry changes
Add NOTIFY to size property so QML bindings are working fine.
Implement Q_PRIVATE_PROPERTY that allows you to declare properties
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8757
Reviewed-by: thartman
|
| | | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 1ebeb971d3382aec0fff927ce2d6ea7b0452584f.
This broke tst_qlistview::wordWrap in QWS
|
| | | |
| | |
| | |
| | |
| | |
| | | |
We bundle the size and the geometry into the same NOTIFY signal.
Reviewed-by:akennedy
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Just add the notify + the signal.
Task-number:QTBUG-8277
Reviewed-by:yoann
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
