| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove left over forward declarations
Avoided the loss of preedit text when losing focus on Symbian.
Added support for ifdeffing for manufacturer in generated pkg files
Shortening and fixing previous fix for QTBUG-6371
Update default FPU flags on Symbian to be softvfp+vfpv2
Using RunFast mode for RVCT
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Shortening: Use much mor code from CommonStyle
Fixing: Subtract PM_Layout[Left|Right]Margin from desktop width.
This fix is anyways not relly useful. It heals some Ui designs with
sizeconstrains which do not fit into mobile screens. But it will fail
In following situations:
Widget, and a too-long combobox in a horizontal Layout. The combobox
would be cropped to Desktop width but the widget(s) left and/or right
of the Combobox are not considered. So, that the Ui still is too wide.
The correct fix will be for set the size policy of the combobox to
something less greedy.
Task-number: QTBUG-6371
Reviewed-by: Sami Merila
modified: gui/styles/qs60style.cpp
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits)
doc: Fixed the last qdoc errors.
doc: Document the "Type" enum value as a const in variable.
Designer: Add lower/raise to context menu.
Compile with no-webkit - add missing semi-colons.
Fixes visibility update missing when doing setParentItem on graphicsitem
Stabilize tst_QGraphicsScene::polishItems2 (new test)
Fixed an infinite loop that could occur when reading invalid BMP images.
Updated docs regarding QGLWidget::renderText() limitations.
Added optimization flag to QGraphicsItemPrivate.
Fixed child items with graphics effects not inheriting opacity.
Made the trace replayer handle limited resolution cases better.
Small optimization in raster paint engine.
Another ASSERT while deleting spans
Implement QDirectFBPixmapData::scroll
Potential crash when adding items from QGraphicsWidget::polishEvent().
QGraphicsWidget is painted twice on the inital show.
Fix QPainter::redirection() to pass autotest.
Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
revert parts of 10392eef4fd4f9
Fix y-inverted pixmaps properly.
...
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
When checking to see if a signal is connected, compare the match-arguments too
Do the refcounting of services watched properly.
Autotest: make the test valid for multiple Qt versions
Cocoa: qfiledialog test spits out memory warnings
Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.
Don't use QDebug references. Instead, pass by value.
QNativeSocketEngine: Set OS error strings on failed read()
QNativeSocketEngine: Also handle unknown errors from socket engine
Qt/Cocoa Event Dispatcher Problem in modal dialogs
Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 )
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 )
'test -e' is a bashism. It's not available in traditional sh.
QFileNetworkReply: Use a QFileEngine
Crash when deleting QMainWindow with native toolbar on Cocoa.
QNativeSocketEngine_win: Don't mess with linger settings
Cosmetic: move the "Alsa support..." line to a more appropriate place
Doc: Fixed broken link.
Doc: Added a warning about the Accelerated Graphics Driver example.
Doc: Fixed installation information for Qt for Embedded Linux.
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Autotest: make the test valid for multiple Qt versions
Cocoa: qfiledialog test spits out memory warnings
Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.
Don't use QDebug references. Instead, pass by value.
QNativeSocketEngine: Set OS error strings on failed read()
QNativeSocketEngine: Also handle unknown errors from socket engine
Qt/Cocoa Event Dispatcher Problem in modal dialogs
Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 )
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 )
'test -e' is a bashism. It's not available in traditional sh.
QFileNetworkReply: Use a QFileEngine
Crash when deleting QMainWindow with native toolbar on Cocoa.
QNativeSocketEngine_win: Don't mess with linger settings
Cosmetic: move the "Alsa support..." line to a more appropriate place
Doc: Fixed broken link.
Doc: Added a warning about the Accelerated Graphics Driver example.
Doc: Fixed installation information for Qt for Embedded Linux.
fix copy-paste error
minor optimization
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem here is the fact that we "trusted" the user when the widget
type was specified. The fix consists in checking the result of the
conversions, if the conversion was successful (i.e. the widget was of
the type specified by the user) then we proceed as usual. If the
conversion was not successful (i.e. wrong widget type) then we ask the
style for a sensible size.
I modified this for QPushButton, QSlider and QToolButton.
Task-number: qtbug-7522
Reviewed-by: jbache
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style does not regard layout orientation when calculating subrects
for QComboBox. This leads to a situation where button is not visible
on UI with RightToLeft orientation.
Task-number: QTBUG-7584
Reviewed-by: Alessandro Portale
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Removes one compiler warning caused by animation support additions
(member variables are initialized in incorrect order in default
constructor). Also, removing unnecessary struct variable and
one unnecessary scope definition.
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QtGui contains loads of resources. 337,160 bytes just for qstyle.
And since this is nearly exclusively full of PNG files,
it won't really be compressed in the qt.sis package.
And it will eat unneccessary Ram.
This patch removes about 260,000 bytes of resources. We only want
the 32-pixel big icons. No 16- and 129- pixel versions.
Task-number: QTBUG-7277
Reviewed-by: Sami Merila
modified: src/gui/kernel/qapplication.cpp
new file: src/gui/styles/qstyle_s60.qrc
modified: src/gui/styles/styles.pri
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
MSVC revealed some issues that are worth a warning.
Reviewed-by: Sami Merila
modified: src/gui/styles/qs60style.cpp
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
The QProgressBar animating code is not meant for the simulated style.
ifdef it out.
Reviewed-by: Sami Merila
modified: src/gui/styles/qs60style.cpp
|
| | |
| |
| |
| |
| |
| |
| | |
Added missing #include.
Task-number: QTBUG-6371
Reviewed-by: Alessandro Portale
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
If long path (or any other long string) is added to a combobox, it
grows outside of screen area. QS60Style needs to check that widget
will not grow wider than screen area.
Task-number: QTBUG-6371
Reviewed-by: Alessandro Portale
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Set StyleHint SH_ItemView_ActivateItemOnSingleClick inactive for 3.x
and 5th edition S60.
Task-number: QTBUG-6182
Reviewed-by: Alessandro Portale
|
| | |
| |
| |
| | |
Reviewed-by: Alessandro Portale
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently S60Style ignores the pressed down state when drawing the
combobox button. This is due to button drawing picking up wrong
QStyleOption (just initialized, no correct style data applied).
Greatly simplified toolbutton drawing and fixed the combobox
to use correct QStyleOption.
Task-number: QTBUG-6950
Reviewed-by: Alessandro Portale
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently only keypad navigation focus is drawn to RadioButtons and
CheckBoxes in non-touch devices. However, in S60 the native widgets
have themed highlight (similar to lists). This task will add that
highlight support for these widgets regardless if keypad navigation
is active or not.
Task-number: QTBUG-5536
Reviewed-by: Alessandro Portale
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
| |
QS60Style does not really support alternating line/cell backgrounds.
This is due to that no such thing exists on native side and we are
using a graphical theme image as list/table background.
For style, we'll use QPalette::Light with some transparecy to achieve
this. Light is guaranteed to have good contrast with theme background
as it is derived from QPalette::Button, which is calculated from
button graphics, which *should* be used on top of theme background.
Task-number: QTBUG-5980
Reviewed-by: Alessandro Portale
|
| |
|
|
|
|
|
| |
Missing #include added to avoid build break.
Task-number: QTBUG-4050
Reviewed-by: Alessandro Portale
|
| |
|
|
|
|
|
|
|
|
| |
Add support of theme animations to AVKON-based QS60Style.
Currently only QProgressBar's have animations, but adding others
with same kind of S60 theming (mainly note animations) would be
really easy to do.
Task-number: QTBUG-4050
Reviewed-by: Alessandro Portale
|
| |\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Move avkon component transparency check to app initialization.
Fix for symbian dialog background transparency.
|
| | |
| |
| |
| |
| |
| |
| | |
If Avkon components support transparency then dialog background is transparent
enabling rounded corners.
Reviewed-by: Sami Merila
|
| |/
|
|
|
|
|
|
|
| |
Some themes such as Nodoka does not draw a focus rect but instead
reads the focus flag on the widget itself. Hence we have to set
this flag before drawing.
Task-number: QTBUG-7504
Reviewed-by: thorbjorn
|
| |
|
|
|
|
|
| |
Reviewed-by: rgriebl
Description:
We pass the wrong gtk style the the background. For most desktop
styles this has no affect, but it breaks on Hildon.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
really, *really* fix the test :}
QFile cannot deal with crlf-translated stdio, so use binary mode
remove trimming of (expected) output
really fix the autotest
support regexp-like quantifiers of expected output lines
remove superfluous \r filtering
print actual rather than expected output for matching text
Do not set the font size unnecessarily in the simulated s60 style.
Doc typos fixed
Translations: Update German for 4.6.1
fix test under windows
don't complain about unresolved base when the reference is absolute
make the lupdate tests more verbose in case of failure
don't use qmake for test setup
move equivalent of output_ts test to good/
look for the .result file in the dir where the output is expected to go
fix sametext and number heuristics
fix number heuristics, part 1
no point in specifying -ts when a .pro file is specified
clean up the lupdatecmd files
...
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (21 commits)
QFile cannot deal with crlf-translated stdio, so use binary mode
remove trimming of (expected) output
really fix the autotest
support regexp-like quantifiers of expected output lines
remove superfluous \r filtering
print actual rather than expected output for matching text
Do not set the font size unnecessarily in the simulated s60 style.
Doc typos fixed
Translations: Update German for 4.6.1
fix test under windows
don't complain about unresolved base when the reference is absolute
make the lupdate tests more verbose in case of failure
don't use qmake for test setup
move equivalent of output_ts test to good/
look for the .result file in the dir where the output is expected to go
fix sametext and number heuristics
fix number heuristics, part 1
no point in specifying -ts when a .pro file is specified
clean up the lupdatecmd files
tidy up the test .pro files
...
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.1
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (73 commits)
doc: update snippets for QtScript function expressions
Prevent a crash when creating an inputContext from the QApplication dtor.
QNAM HTTP Code: Cache socket state inside ensureConnection()
tst_qhttpnetworkconnection: Test also HEAD in some tests
tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
QNAM HTTP Code: When starting new request, prefer connected sockets.
typo fix
Added the 'framecapture' WebKit example to the default build.
Fix code example
fix typo in qreadwritelock's documentation
QNAM HTTP: Don't call d_func() so often
QNAM HTTP: Fix readBuffer maximum size.
QNAM HTTP: Optimize eatWhitespace()
QNAM HTTP: Check if socket already tries to connect.
network internals: fix build on S60
[syncqt] Make -separate-module work with WebKit's directory structure
doc: Corrected explanation of when append() does nothing.
doc: Added clarification about allocating space for the 0 terminator.
Add a way to access the normalised URL in QUrl.
[syncqt] Make it possible to synchronize headers for a separate module
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task: QTBUG-6952
RevBy: ogoffart
Details:
We simply need to handle this case explicitly to draw like
a GtkEntry.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task: QTBUG-7198
RevBy: ogoffart
Details:
It was impossible to override the checkbox positioning in a custom
style if any style sheet was set on the application of widget.
This was because the style sheet never passed control to the
base style. We now fix it by checking if the style sheet has
the appropriate style rules.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task: QTBUG-6522
RevBy: thorbjorn
Details:
This fixes missing separator line in the Dust theme.
The patch also significantly improves the accuracy of menu item
size metrics by making use of gtk_widget_size_request to query
things like default heights.
- More accurate offset and size of separators
- Fixed item height of menu items using size_request
- Fixed vertical offset of label and check boxes
- Fixed clipping issue on last menu item
|
| | | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-6405
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-6615
|
| | | | |/
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
control element correctly if given widget is null.
Uses now alignment hint value given in style option.
Task-number: QTBUG-7267
Reviewed-by: Janne Koskinen
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Warning such as
QFont::setPointSizeF: Point size <= 0 (-1.000000), must be greater than 0
because the font size might be specified in pixel, and pointSizeF
returns -1 if the font size is in pixel (as documented)
Reviewed-by: jbache
Task-number: QTBUG-7263
|
| |/
|
|
|
|
|
|
|
|
| |
native border."
This reverts commit 6e90192b599cee9b903177a0978198326f667613.
his change the behaviour a little bit. It is better to wait for Qt 4.7
Reviewed-by: jbache
|
| |
|
|
|
|
|
| |
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
|
| |
|
|
|
|
|
| |
Ask selected state only once in QS60Style when handling element
CE_TabBarTabLabel.
Reviewed-by: TrustMe
|
| |
|
|
| |
Reviewed-by: TrustMe
|
| |
|
|
|
|
|
|
|
|
|
| |
ComboBoxes and SpinBoxes are squeezed in QVGA screens, due to
dodgy style calculations.
This fix ensures that sub-widget buttons for these widgets are always
square.
Task-number: QT-2158 (internal)
Reviewed-by: axis
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Since dialogs use their own theme graphics for background, regular
method of checking the palette fails (as generic background brush is
probably unchanged). Therefore to check if the dialog background is
using default (=theme graphic), it needs to check the cache key value
of background - so that it matches with the one in stored theme
palette.
Task-number: QTBUG-5898
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
|
|
| |
Previously style casted widgets to QDialog to see if it is able to
draw dialog background theme graphic.
As a fix, we now query window flag from the widget and if it is
equivalent of Qt::Dialog, draw dialog background.
Task-number: QTBUG-5930
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently what happens when orientation changes is:
1. Application gets notification that status pane size has changed.
2. Qt resizes S60Data to new size, and sends resize event.
3. Application redraws itself. But style is still using incorrect
screen size internally, so background brush is incorrect. Redrawing
thus might showup white rect on-screen.
4. Style gets notification that orientation is changed and style then
deletes existing background brush.
5. Style creates a new background brush and sends events to all toplevel
widgets that style has changed
6. Widgets might draw themselves with new style background brush.
What this fix changes is:
1. When application first tries to redraw itself, style notices that
the background brush size does not match to active screen size.
2. Style immediately re-creates background brush
3. Since cachekey for pixmaps won't match, new background is not drawn
until after background brush has been updated to application palette.
4. Due to #1 style needs to remove deletion of background brush from
clearCaches to avoid deleting (and re-creating) background twice.
Task-number: QTBUG-6428
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
| |
Using math wrapper functions instead direct call. This gives us top-level
control to what (single/double) precision we are effectively using.
Task-number: QTBUG-4894
Reviewed-by: janarve
Reviewed-by: Kim Motoyoshi Kalland
|
