summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updates to new Symbian DEF file systemIain2010-01-263-8/+10
| | | | | | | | | | | | | | | Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to see if DEF files were enabled, when setting the DEF file path Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was defined when testing for its value, due to incorrect use of QMap::operator[] Tidy up configure.exe help for new def files option Task-number: QTBUG-6556 Reviewed-by: Jason Barron Reviewed-by: Janne Koskinen
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-2611-152/+298
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add a convenience batch file to run the patch capabilities perl script QFileDialog layout issue on Symbian (part2) QFileDialog layout issue on Symbian QListWidget itemActivated does not follow S60 conventions Remove unnecessary scope definitions from QS60Style QS60Style: Combobox button is not drawn pressed Made characters in a password field briefly visible while typing. RadioButtons/Checkboxes should have theme highlight QListView::setAlternatingRowColors is not working Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.
| * 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
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-262-36/+67
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Use HighlightAllOccurrences to have highlighting after full text search.
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-252-36/+67
| |\ \ |/ / / | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Use HighlightAllOccurrences to have highlighting after full text search.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-252-36/+67
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Use HighlightAllOccurrences to have highlighting after full text search.
| | * | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-222-36/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-2511-58/+533
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Improve DEF file enable/disable mechanism on Symbian S60Style: Add support for animations to style (part2) S60Style: Add support for animations to style
| * | 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
| * | 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-2113-30/+41
| |\ \
| | * | Revert "Make an empty QUrl also be considered non-detached (d == 0)."Thiago Macieira2010-01-212-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | as agreed with Warwick. This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
| | * | SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-215-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-212-0/+10
| | | | | | | | | | | | | | | | | | | | Task-number: 6666 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | Add qttracereplay.exe to gitignoreMarkus Goetz2010-01-211-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | 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-2112-57/+141
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 from upstreamShane Kearns2010-01-213-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch accepted upstream has the signal and slot renamed, so there is a corresponding change to main.cpp commit 53c672fb9853fef5a00285213084f02a4253e5f3 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 21 15:45:40 2010 +0100 trk: Handle TrkNotifyStopped in launcher. Add signal and static utility functions to parse message. Reviewed-by: Robert Loehning <robert.loehning@nokia.com> Initial-patch-by: Shane Kearns <shane.kearns@sosco.com> Task-number: QTBUG-7444
| * | Merge from upstreamShane Kearns2010-01-213-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch accepted upstream changed a parameter from QString to QStringList. So there is a corresponding change to main.cpp to use the new API. commit b1291ecfd0ab31c41783feb645c98ce42fa87aae Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 21 12:33:34 2010 +0100 trk: Add support for command line arguments in trk::Launcher. Initial-patch-by: Shane Kearns <shane.kearns@sosco.com> Task-number: QTBUG-7444
| * | Fix pro file error affecting windows buildsShane Kearns2010-01-211-1/+1
| | | | | | | | | | | | Reviewed-by: axis
| * | Merge TRK client changes from upstream (QtCreator)Shane Kearns2010-01-212-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1b77161e7183cdd4b5493698b4cddc727468f0f5 Author: hjk <qtc-committer@nokia.com> Date: Fri Jan 15 12:01:26 2010 +0100 debugger: clean up verbosity settings in trk adapter commit 4d7341becac684f5feb908e45d8b1756b4823c20 Author: hjk <qtc-committer@nokia.com> Date: Wed Jan 13 14:48:29 2010 +0100 debugger: whitespace commit d3cdfe813444b6afca483c7d13ac80c4c8eda62b Author: hjk <qtc-committer@nokia.com> Date: Wed Jan 13 14:46:13 2010 +0100 debugger: add some debug output to trk device commit 7cd27f2eecd5f77bc35f6b705c6f0422b09e534d Author: hjk <qtc-committer@nokia.com> Date: Mon Jan 4 13:17:38 2010 +0100 debugger: add list of thread ids to TRK session state object Reviewed-by: Shane Kearns
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-2110-62/+107
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 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.
| * | QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| | | | | | | | | | | | | | | Task-number: QTBUG-7420 Reviewed-by: kh1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-216-42/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7432 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
generated by cgit v0.12 at 2024-10-08 02:39:01 (GMT)