| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix compiler warning in qtextdocument.cpp
Fix crash when app font is added
Use truncate only for subpixel boundingBox x position
Use more numerically robust algorithm to compute QBezier::pointAt().
Fix editable combobox style on Mac
Revert 344a4dcfe and part of 93bce787
Fix raster subpixel positioning in Lion
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Jens Bache-Wiig
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
PP_TRANSPARENTBAR)
Merge-request: 2616
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
|
| |\ \ \ |
|
| | |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix for menu transparency (QTBUG-16857) unveiled an issue in the
QS60Style when drawing QMenu background.
Style skips drawing of the menu background, since placeHolder
texture for QPalette::Window is not replaced with real background
for menus. Therefore, we need to check if the widget's palette
is still untouched when deciding whether or not to draw the
menu background.
Task-number: QTBUG-20255
Reviewed-by: Tomi Vihria
|
| |\ \ \
| |/ / |
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use correct native theme graphic for dialog backgrounds. In the past,
native menu background graphic was used for dialogs and menus.
Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Also sets the read-only state in QStyleOptionSpinBox, wich wasn't before.
Reviewed-by: Jens Bache-Wiig
|
| |\ \ \
| |/ / |
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
StandardIcon enum comparison should be done with bitwise operation,
not with value.
Task-number: QTBUG-20240
Reviewed-by: Tomi Vihria
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add custom standard icons for Symbian iconography. Additionally,
map few existing standard icon enums to new icons.
Task-number: QT-5116
Reviewed-by: Miikka Heikkinen
|
| |/ /
| |
| |
| | |
Reviewed-by: Jens Bache-Wiig
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
src/s60installs/s60installs.pro
|
| | |
| |
| |
| |
| |
| |
| | |
Add also include to QS60Style to avoid build failure.
Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Autotest fails since calling QApplication::setPalette() clears away
QPalette hash (class specific palette information). QS60Style tries
to re-set theme-specific hash after updating application palette with
real theme background, but does not take into account that application
might have defined own custom palette hash data.
As a fix, store the previously set palette hash information and restore
it after calling QApplication::setPalette(). Additionally, remove the
palette change event sending, since QApplication will post that event
anyway when palette is updated.
Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
|
| | |
| |
| |
| |
| |
| | |
New files after previous license change round.
Reviewed-by: Trust Me
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (28 commits)
Use numeric virtual keyboard for all number entry modes.
QTBUG-17776, reporting terminated threads as not running on Symbian
Splitview - Auto-translation rules changed
Support clipboard function on Symbian
Added qmlshadersplugin to Symbian qt.iby-file.
Workaround webkit deadlock on macos x
Disable antialiasing for tiled image drawing.
Ensure visibility of input widget in QML app when doing layout switch
Def update for gui, openvg, and opengl.
Revert "Def update."
Fix trailing whitespace
Remove unnecessary resizes during orientation change
Revert "Symbian: Fix QFontInfo::pixelSize()"
Improving warning messages in QVolatileImage.
Proper naming for raster pixmap and paintengine on Symbian.
Def update.
Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
Resizable graphicsview's background is drawn incorrectly in splitview
Add inputcontext reset to orientation switch in Symbian
QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
...
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As QTBUG-19880 highlighted, the old S60 naming is not suitable for
these classes anymore.
Task-number: QTBUG-19913
Reviewed-by: Jani Hautakangas
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
New Symbian root theme defines KAknsIIDQsnFrSetOpt as empty.
Drawing the frame through native API produces white box.
Since the frame is no longer used on the native side,
skip drawing it from style.
Task-number: QTBUG-19782
Reviewed-by: Tomi Vihria
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
SVG icons automatically resize to the size of the pixmap, so the
size of the icon pixmap needs to be what the platform expects. Added
custom pixel metrics for CBA icon size that can be utilized for this
purpose.
Task-number: QT-5115
Reviewed-by: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Pixel metrics for focus frame (PM_FocusFrameVMargin and
PM_FocusFrameHMargin) had invalid values for VGA screens. Additionally
these same pixel metrics were adjusted for nHD.
Now, all but one QTreeView test cases pass for either screensize.
Task-number: QT-5056
Reviewed-by: Tomi Vihria
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changing the library names to lowercase breaks 5.0-based
Linux builds. It will be investigated if it is possible to
change the SDKs instead. If not, the patch will have to be
extended to use the original names for 5.0 and the lowercased
ones otherwise.
This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing Linux compatibility issues for Symbian
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Laszlo Agocs
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\ \ \
| |/ / |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | | | | | |
|
| | |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes QTBUG-18311.
Merge-request: 2621
Reviewed-by: Joao
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
An itemview item with checkstate and highlight is drawn incorrectly
without checked state.
Consolidate check state drawing logic to happen into one place to
avoid incorrect check states.
Task-number: QTBUG-19668
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Style was using a pixel metric value for the rect, when it has already
earlier calculated a correct size rect to use for an itemview item icon.
Use the calculated value, as it is correct in all cases (just icon,
icon + checkbox, icon + text, icon + checkbox + text).
Task-number: QTBUG-19330
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove S60 3.x support from QS60Style.
Task-number: QTBUG-18615
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \
| | |/ /
| |/| | |
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |/ /
| |
| |
| |
| |
| |
| | |
There are couple uninitialized variables in QS60Style.
This also corrects compilation warnings for the class.
Reviewed-by: Tomi Vihria
|
| | |
| |
| |
| |
| |
| | |
Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679
Task-number: QTBUG-18998
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
configure
|
| | |\ \ |
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Recent changes in QS60Style (to support placeholder background texture)
causes the simulated style not to build. The implementation
for new method placeHolderTexture() is on the Symbian-specific
sourcefile, which is omitted in the simulator builds.
As a fix, move the implementation to the "generic" style source
file qs60style.cpp, since the method does not contain any
Symbian specific code.
Task-number: QTBUG-18863
Reviewed-by: owolff
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
