summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Made some changes after code review.axis2010-02-121-6/+10
| | | | | | | | | | | - 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
* Move duplicated code out to a qmake featureThomas Zander2010-02-092-9/+2
|
* Merge branch 'pkgGeneratorForLinux'axis2010-02-091-27/+37
|\ | | | | | | | | Conflicts: mkspecs/symbian/linux-armcc/features/symbian_building.prf
| * Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-041-27/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Disable sqlite plugin compilation on symbian by defaultThomas Zander2010-02-081-2/+0
| |
* | Make link bootstrap again.Thomas Zander2010-02-081-2/+2
| | | | | | | | Fix the borked fix and re-add the dollar signs.
* | Fix linking for armlinkThomas Zander2010-02-041-3/+3
| | | | | | | | | | | | | | | | using LIBS += -LanyDir is wrong as that depends on 'ld' accepting -L the correct cross-platform approach is to use QMAKE_LIBDIR += anyDir
* | Fix include to work on case-sensitive filesystems.Thomas Zander2010-02-041-1/+1
| |
* | Make webkit compile on linux+armccaxis2010-02-041-3/+9
|/ | | | Based on a patch by Thomas Zander.
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2641-287/+1000
|\ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/gui/kernel/qapplication_s60.cpp
| * 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-252-1/+10
| | | | | | | | | | Task-number: QTBUG-7518 Reviewed-by: Janne Koskinen
| * Improve DEF file enable/disable mechanism on SymbianIain2010-01-221-25/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-226-6/+51
| |\ | | | | | | | | | | | | | | | | | | | | | 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-225-6/+62
| | | | | | | | | | | | | | | | | | | | | 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/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2213-23/+88
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * QSslSocket: Take better care on how we use the SSL buffersMarkus Goetz2010-01-211-3/+23
| | | | | | | | | | | | | | | | | | .. and breaking out of a loop where we should. Reviewed-by: thiago
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-214-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 ) Changes in WebKit/qt since the last update: * Girish: Fix positioning of ComboBox popup in QGraphicsWebView. -- https://bugs.webkit.org/show_bug.cgi?id=33887
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-216-10/+13
| | |\
| | | * Revert "Make an empty QUrl also be considered non-detached (d == 0)."Thiago Macieira2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | as agreed with Warwick. This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
| | | * SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the file/data ends in the END CERTIFICATE line without a newline, the certificate is still valid. If it's followed by anything other than a newline, then it's no longer valid. Also add another test for the BEGIN CERTIFICATE ending without newline, to ensure we don't crash there either. Reviewed-By: Peter Hartmann
| | | * QNAM HTTP: make it give some better error messages in case of socket failure.Thiago Macieira2010-01-213-5/+7
| | | | | | | | | | | | | | | | Reviewed-By: Peter Hartmann
| | | * qUncompress: Fix terminating \0Markus Goetz2010-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | Task-number: 6666 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | doc: Documented the return value for QDomNode::appendChild().Martin Smith2010-01-211-4/+8
| | |/ | | | | | | | | | Task-number: QTBUG-7498
| | * Fix missing focus rect for check and radio buttons in some GTK+ themesJens Bache-Wiig2010-01-211-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-216-6/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update symbian def files Merge from upstream Merge from upstream Fix pro file error affecting windows builds Merge TRK client changes from upstream (QtCreator)
| | * | Update symbian def filesShane Kearns2010-01-216-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5464cee529a26832517607b764e805bef96ea9f1 changes 3 private class symbols. Reviewed-by: Trust Me
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-215-42/+42
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtHelp: Enable dynamic translation. Designer: Fixed a crash when previewing in a non-existent style. uic3: Introduced option to preserve layout object names of Designer 3.
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-215-42/+42
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fixed a crash when previewing in a non-existent style. uic3: Introduced option to preserve layout object names of Designer 3.
| | | * | uic3: Introduced option to preserve layout object names of Designer 3.Friedemann Kleint2010-01-215-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce options flag mask for better handling in UI3Reader. Pass on layout name. Task-number: QTBUG-7404 Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Initial-patch-by: Andy Shaw <andy.shaw@nokia.com>
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-211-0/+32
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Menubar and dock disappear after hiding a fullscreen widget on Cocoa. Changelog.
| | * | | Menubar and dock disappear after hiding a fullscreen widget on Cocoa.Carlos Manuel Duclos Vergara2010-01-211-0/+32
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here was exiting the full screen mode. In Cocoa we don't activate windows as we do in Carbon, therefore we were not exiting from the full screen mode. This patch adds a check when hiding a window, if the window is in full screen mode then we go through the list of top level windows checking if there are any other visible and not-minimized windows that are also in full screen mode. If none if found, the we exit the full screen mode. Task-number: QTBUG-7312 Reviewed-by: Prasanth
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-211-3/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix semitransparent windows with DirectFB
| | * | Fix semitransparent windows with DirectFBAnders Bakken2010-01-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This filling of the window surface is a bug. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-213428-7209/+12276
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/platform_paths.prf
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-203-11/+44
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: 1st attempt at USB serial port enumerator for linux Corrected alphabetic order in the docs for events. Implemented event filter functions for Symbian.
| | * | Corrected alphabetic order in the docs for events.axis2010-01-201-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Implemented event filter functions for Symbian.axis2010-01-202-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only the symbian specific event filters were called, but now all filters in QApplication, QAbstractEventDispatcher and QInputContext should be called. Task: QT-2629 RevBy: Jason Barron Autotest: Passed
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-206-17/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::hasFocus() performance regression. Fix crashes in QByteArray Move the labels a bit down so that they align better vertically with the field. Add command to qmake to do symbian-uid generation Fixed QBitmap::load to load into bitmap format again. Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. Text drawing is not fast currently
generated by cgit v0.12 at 2024-11-12 15:32:43 (GMT)