summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Made some changes after code review.axis2010-02-125-12/+44
| | | | | | | | | | | - 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
* More src!=builddir fixes for symbian makefile generatorThomas Zander2010-02-111-3/+10
|
* Place the generated pkg file in the build dir.Thomas Zander2010-02-101-3/+3
|
* Make the symbian build not bail out over missing filesThomas Zander2010-02-101-0/+1
|
* Remove dummy lines that disabled mifconvThomas Zander2010-02-101-6/+0
| | | | | The linux mifconv wrapper script has been fixed so this disabling is no longer needed.
* Move duplicated code out to a qmake featureThomas Zander2010-02-093-9/+10
|
* Updated installation instructions.axis2010-02-091-16/+43
|
* Merge branch 'pkgGeneratorForLinux'axis2010-02-0921-721/+1062
|\ | | | | | | | | Conflicts: mkspecs/symbian/linux-armcc/features/symbian_building.prf
| * Added symbian resources to target predeps.axis2010-02-091-1/+1
| | | | | | | | | | | | 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.
| * Fixed some files in the clean target.axis2010-02-091-1/+2
| |
| * Implemented rss file generator for Linux.axis2010-02-098-438/+554
| | | | | | | | | | | | | | | | | | 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.
| * Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-0420-297/+521
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Fixed path separators in the plugin stub generator.axis2010-02-011-2/+2
| |
* | Disable sqlite plugin compilation on symbian by defaultThomas Zander2010-02-082-2/+8
| |
* | Don't make an s60main dir for non-symbian buildsThomas Zander2010-02-081-0/+1
| |
* | Make link bootstrap again.Thomas Zander2010-02-081-2/+2
| | | | | | | | Fix the borked fix and re-add the dollar signs.
* | use the proper QMake option to find a shared header fileThomas Zander2010-02-044-4/+4
| |
* | Fix linking for armlinkThomas Zander2010-02-044-11/+9
| | | | | | | | | | | | | | | | using LIBS += -LanyDir is wrong as that depends on 'ld' accepting -L the correct cross-platform approach is to use QMAKE_LIBDIR += anyDir
* | Re-anable building of lrelease and fix the translations dir to 'compile'Thomas Zander2010-02-042-2/+2
| | | | | | | | | | | | | | 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).
* | Fix include to work on case-sensitive filesystems.Thomas Zander2010-02-041-1/+1
| |
* | Merge branch 'webkitCompile'axis2010-02-043-4/+18
|\ \
| * | Make webkit compile on linux+armccaxis2010-02-041-3/+9
| | | | | | | | | | | | Based on a patch by Thomas Zander.
| * | Fixed compilation in ARM mode.axis2010-02-042-1/+5
| | | | | | | | | | | | An extra define needs to change between ARM/Thumb.
| * | Fixed compiler arguments when compiling in debug/release mode.axis2010-02-041-0/+4
| |/
* | Remove bash-isms and make elf2e32 work properly.Thomas Zander2010-02-011-2/+4
|/ | | | | | 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.
* Made the package template a little more correct.axis2010-01-261-1/+2
| | | | | | | | - 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.
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2670-386/+1254
|\ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/gui/kernel/qapplication_s60.cpp
| * Add a convenience batch file to run the patch capabilities perl scriptMarius Storm-Olsen2010-01-261-0/+1
| | | | | | | | Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
| * QFileDialog layout issue on Symbian (part2)Sami Merila2010-01-261-0/+1
| | | | | | | | | | | | | | Added missing #include. Task-number: QTBUG-6371 Reviewed-by: Alessandro Portale
| * QFileDialog layout issue on SymbianSami Merila2010-01-261-0/+18
| | | | | | | | | | | | | | | | | | 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
| * QListWidget itemActivated does not follow S60 conventionsSami Merila2010-01-254-1/+12
| | | | | | | | | | | | | | | | Set StyleHint SH_ItemView_ActivateItemOnSingleClick inactive for 3.x and 5th edition S60. Task-number: QTBUG-6182 Reviewed-by: Alessandro Portale
| * Remove unnecessary scope definitions from QS60StyleSami Merila2010-01-251-70/+70
| | | | | | | | Reviewed-by: Alessandro Portale
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-01-252-2/+55
| |\
| | * Made characters in a password field briefly visible while typing.axis2010-01-252-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | QS60Style: Combobox button is not drawn pressedSami Merila2010-01-251-75/+35
| |/ | | | | | | | | | | | | | | | | | | | | 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
| * RadioButtons/Checkboxes should have theme highlightSami Merila2010-01-251-0/+65
| | | | | | | | | | | | | | | | | | | | | | 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
| * QListView::setAlternatingRowColors is not workingSami Merila2010-01-251-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.Miikka Heikkinen2010-01-254-2/+22
| | | | | | | | | | Task-number: QTBUG-7518 Reviewed-by: Janne Koskinen
| * Improve DEF file enable/disable mechanism on SymbianIain2010-01-225-27/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * S60Style: Add support for animations to style (part2)Sami Merila2010-01-221-0/+1
| | | | | | | | | | | | | | Missing #include added to avoid build break. Task-number: QTBUG-4050 Reviewed-by: Alessandro Portale
| * S60Style: Add support for animations to styleSami Merila2010-01-226-31/+464
| | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-227-7/+52
| |\ | | | | | | | | | | | | | | | | | | | | | 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.
| | * Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-224-34/+23
| | | | | | | | | | | | Reviewed-by: Sami Merila
| | * Fix for symbian dialog background transparency.Jani Hautakangas2010-01-226-7/+63
| | | | | | | | | | | | | | | | | | | | | If Avkon components support transparency then dialog background is transparent enabling rounded corners. Reviewed-by: Sami Merila
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Assistant docs: Fix link.ck2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4607 Reviewed-by: David Boddie
| | * | QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5908 Reviewed-by: kh1
| | * | Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6796 Reviewed-by: kh1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2220-43/+116
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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