| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
- Changed makefile generator name to SYMBIAN_UNIX, to be more in line
with the other generators.
- Explained the reason for avoiding virtual inheritance in a bit more
detail.
- Removed an unnecessary string replacement.
- Fixed the location of s60 plugins for MMP based generators.
RevBy: Miikka Heikkinen
|
| |
|
| |
|
| |
|
|
|
|
|
| |
The linux mifconv wrapper script has been fixed so this disabling is no
longer needed.
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/symbian/linux-armcc/features/symbian_building.prf
|
| |
| |
| |
| |
| |
| | |
This is required in the cases where the target does not directly
include the rsg files, but the corresponding rsc file is still needed
on the target device.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Most code was reused from the Windows generator. Icons don't
currently work due to a problem with the mifconv tool.
In addition backslashes were changed to slashes in all common code,
since qmake seems to prefer this when doing path cleanup and the
like.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It reuses almost everything from the original pkg generator, but the
code had to be restructured to accomodate for the new makefile
generator. In addition a few new codepaths and profile changes had to
be introduced to cope with the fact that this mkspec puts files in
different places than Symbian does (inside $QTDIR/lib instead of
$EPOCROOT/...).
This enables the pkg generator to generate correct pkg files for Qt
itself, but applications will not work yet because they also require
generated rss files.
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Fix the borked fix and re-add the dollar signs.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
using
LIBS += -LanyDir
is wrong as that depends on 'ld' accepting -L
the correct cross-platform approach is to use
QMAKE_LIBDIR += anyDir
|
| |
| |
| |
| |
| |
| |
| | |
If we want translations to work, we need lrelease, so that should not
be disabled anymore for symbian.
Work around the hack of translations/translations.pro to not link anything
so we don't do post-linking on symbian (which failed).
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Based on a patch by Thomas Zander.
|
| | |
| | |
| | |
| | | |
An extra define needs to change between ARM/Thumb.
|
| |/ |
|
|/
|
|
|
|
| |
elf2e32 doesn't seem to return a non-null value on error. To avoid silently
continuing we need to detect there is an error in the output of the command
and stop the build if there is.
|
|
|
|
|
|
|
|
| |
- First of all, make sure that the exe file is named wiggly, because
that is what the rsc files contain, and therefore what the menu
will try to launch.
- Second, make sure that s60main.rsc is included as a resource since
GUI applications will not run without it.
|
|\
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/gui/kernel/qapplication_s60.cpp
|
| |
| |
| |
| | |
Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This was done by intercepting key events with text in them, and
temporarily submit them as preedit text instead of real input text.
Currently it does not work in WebKit, but that is because WebKit
hides preedit text as well, which is a bug of its own.
RevBy: Simon Hausmann
Autotest: Manual testing went fine
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7518
Reviewed-by: Janne Koskinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Provide configure flag to enable/disable the use of DEF files on Symbian.
A useful side-effect was that it cleaned up how we control DEF files from
qbase.pri and in WebKit.
-nokia-developer still disables DEF files, as it triggers the autotest
exports, which are not frozen into the DEF files.
Disabling DEF files means that there is no BC with previously released
versions of Qt, so this should only be used for development purposes.
.pro files can specify custom locations for DEF files by setting
defFilePath.
Task-number: QTBUG-6556
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Sami Merila
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If Avkon components support transparency then dialog background is transparent
enabling rounded corners.
Reviewed-by: Sami Merila
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant docs: Fix link.
QtHelp docs: Fix illegal namespace name.
Assistant: Set correct mime type for text documents.
|
| | |\ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant docs: Fix link.
QtHelp docs: Fix illegal namespace name.
Assistant: Set correct mime type for text documents.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-4607
Reviewed-by: David Boddie
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-5908
Reviewed-by: kh1
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-6796
Reviewed-by: kh1
|
| |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket: Take better care on how we use the SSL buffers
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 )
Revert "Make an empty QUrl also be considered non-detached (d == 0)."
SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLF
doc: Documented the return value for QDomNode::appendChild().
QNAM HTTP: make it give some better error messages in case of socket failure.
qUncompress: Fix terminating \0
Add qttracereplay.exe to gitignore
Fix missing focus rect for check and radio buttons in some GTK+ themes
|