| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
|
| | | |
| | |
| | |
| | | |
Putting the code for "case CT_ComboBox:" into {}
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was really caused by a change done to the font engine in 4.6.
We now return a pixel less for the font height in multiple widgets.
Some of these should be addressed in a separate patch. This patch
simply ensures that the text rect is not clipped, but will not
alter the height of the widget.
Task-number: QTBUG-7662
Reviewed-by: prasanth
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add auto-generated tests for QScriptValue
Add changes for 4.6.2
Changelog: Added Designer/uic3 changes for 4.6.2
Revert "Improve raster graphics system performance on Mac."
Introduce of QScriptValue autotest generator.
Fixed potential crash in mac style
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 69dd29fbeb12d076741dce70ac6bc155101ccd6f )
Remove PrintDialog frame on Mac
Fix missing non-unified toolbar margins on Mac
Add a warning when there are duplicate aliases in a resource file.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a733444d3be6605552471f047558927495ff62b7 )
Improve raster graphics system performance on Mac.
Fixed compile of framecapture, simpleselector for symbian-abld winscw.
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The tool bar appearance have regressed in 4.6 for applications that
do not utilize the unified tool bar appearance. This fix restores the
margin and spacing to their 4.5 appearance.
Task-number: QTBUG-7831
Reviewed-by: morten
|
| | |\ \ |
|
| | | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Pixel metric values for PM_FocusFrameVMargin and PM_FocusFrameHMargin
were based on AVKON grid layout. Apparently, AVKON has a major
difference for text margin in lists and grids. List values are almost
double of what is used in the grids.
Original values were poor fit for list usability, it made the text items
very close to each anothre.
Task-number: QTBUG-7258
Reviewed-by: Alessandro Portale
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The removed code simply reduces the size of the rect when running
with RightToLeft without compensating anywhere else. It seems to be
a leftover from a previously removed piece of code.
Reviewed-by: richard
Task-number: QTBUG-6882
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/getting-started/installation.qdoc
src/gui/dialogs/qfiledialog_win.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The removed code simply reduces the size of the rect when running
with RightToLeft without compensating anywhere else. It seems to be
a leftover from a previously removed piece of code.
Reviewed-by: richard
Task-number: QTBUG-6882
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed compile for wincewm60standard-msvc2008 (attempt 2)
Fixed compile for wincewm60standard-msvc2008.
Fixed compile.
Fixed compile for wincewm60standard-msvc2008.
Fixed compile when Qt is configured with -no-webkit
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed compile for wincewm60standard-msvc2008 (attempt 2)
Fixed compile for wincewm60standard-msvc2008.
Fixed compile.
Fixed compile for wincewm60standard-msvc2008.
Fixed compile when Qt is configured with -no-webkit
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
(cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/getting-started/installation.qdoc
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed the host detection in qmake profiles.
Improving parts of commit 2d8d855d.
qmake: add Linux host support to Symbian generator
Fixed indentation.
Add Linux host support to Symbian mkspecs.
Linux support for platform specific commands in .pro files.
Add createpackage.bat equivalent for Unix systems.
Make all Symbian #includes lower case.
mkspecs: fix warning when calling qmake
Fix portability problems in bin/createpackage.pl.
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
bin/createpackage.pl
mkspecs/features/symbian/application_icon.prf
qmake/generators/symbian/symmake_abld.cpp
src/gui/text/qfontdatabase_s60.cpp
src/s60main/s60main.pro
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: axis <qt-info@nokia.com>
|
| | | |\ \ \ \ \ |
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | | |\ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This is because the light() color of the palette is used and it was
not modified.
Task-number: QTBUG-7216
Reviewed-by: jbache
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This patch draws the focus frame for widgets other than QLineEdit (e.g.
for line edits in Webkit). The frame is drawn outside the rectangle
passed in the option-rect.
Task-number: QTBUG-5530
Reviewed-by: MortenS
|
| | | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
