summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added Methods to set and access QSoftKeyStack from QMainWindow.Markku Luukkainen2009-05-135-9/+75
|
* Fixed pImpl, the private object were not created.Alessandro Portale2009-05-135-14/+26
|
* Merge commit 'origin/master' into softkeysAlessandro Portale2009-05-135-40/+63
|\
| * S60Style: Slightly better drawing code for QTreeView node indicators.Sami Merilä2009-05-121-14/+19
| |
| * S60style: use correct theme text color for highlighted line edit texts.Sami Merilä2009-05-121-0/+5
| |
| * Fixed background of preedit text.axis2009-05-121-7/+0
| | | | | | | | | | | | | | | | | | | | This changes the appearance on X11 and Mac, but it seems to be the way it is done in other applications. In addition it fixes S60 background of preedit text, which is supposed to be transparent. RevBy: denis
| * Fixed the translation from S60 text format to Qt text format in FEP.axis2009-05-122-18/+34
| | | | | | | | | | | | | | | | | | | | This was done by making sure that the format code is called from both start and update, because S60 will often return nothing in start, but then later on return something in update. In addition, we fall back on our own format if S60 does not give us anything. Currently it seems to give us a format only when using predictive text.
| * Fixed autoSipEnabled default value on non-WinCE platforms.axis2009-05-121-1/+5
| |
* | Adding qsoftkey* to widgets.pri. Currently, only for S60. It will spreadAlessandro Portale2009-05-121-1/+10
| | | | | | | | as soon as it builds cross platform.
* | Adapted example codeAlessandro Portale2009-05-122-14/+2
| |
* | Moved SoftkeyStack files into src/widgetsAlessandro Portale2009-05-126-29/+44
| | | | | | | | Corrected PImpl-ing and cleaned up headers
* | Removed redundanciesAlessandro Portale2009-05-121-5/+0
| |
* | Qt-ifications. Mostly license headers and coding conventions.Alessandro Portale2009-05-127-136/+355
| |
* | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Alessandro Portale2009-05-124-23/+28
|\ \ | | | | | | | | | softkeys
| * | Added handling of softkey with the role of menuMarkku Luukkainen2009-05-121-1/+7
| | |
| * | Initial naive implementation for menu softkeyMarkku Luukkainen2009-05-122-9/+21
| | |
| * | Removed setting native softkeys from menu implementation as fromMarkku Luukkainen2009-05-121-13/+0
| | | | | | | | | | | | now on the menu softkey will be set by the brand new softkey stack.
* | | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Alessandro Portale2009-05-12207-1247/+2923
|\ \ \ | |/ / | | | | | | softkeys
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-121-0/+6
| |\ \ | | |/ | | | | | | softkeys
| | * Added symbian specific ifdefs and checks so that QMenuBar doesn'tMarkku Luukkainen2009-05-121-0/+6
| | | | | | | | | | | | return inappropriate sizehints when native menubar is used
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-1226-82/+73
| |\ \ | | |/ | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/widgets/qmenu_symbian.cpp
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-05-1125-77/+105
| | |\
| | | * Fix for disappearing options menu button when starting some ofMarkku Luukkainen2009-05-111-1/+1
| | | | | | | | | | | | | | | | the example applications
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicMarkku Luukkainen2009-05-1125-57/+68
| | | |\
| | | | * Make QLineEdit care about autoSipEnabled.axis2009-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | If the property is disabled, it will not ask for an input panel.
| | | | * Make autoSipOnMouseFocus non-static.axis2009-05-111-3/+2
| | | | | | | | | | | | | | | | | | | | This way we are consistent with autoSipEnabled.
| | | | * Small doc update.axis2009-05-111-0/+2
| | | | |
| | | | * Make autoSipEnabled available on all platforms.axis2009-05-113-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is relevant on S60 too, so it's time to make it cross platform. RevBy: mauricek
| | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-111-21/+38
| | | | |\
| | | | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-111000-19513/+46778
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_symbian.cpp
| | | | * | | Fixed namespace issues, now works on Symbian under namespaceJanne Koskinen2009-05-1122-44/+53
| | | | | | |
| | | * | | | Changed implementation to use QMultiHash instead of QHash.Markku Luukkainen2009-05-111-2/+2
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Fixes a bug when setting a new menubar to QMainWindow
| | | * | | Refactored implementation so that it works with multiple QMainWindowsMarkku Luukkainen2009-05-111-21/+38
| | | | |/ | | | |/|
| | * | | A better way of getting the screen's colour depthIain2009-05-111-21/+2
| | |/ /
| * | | Refactored implementation so that it works with multiple QMainWindowsMarkku Luukkainen2009-05-111-21/+38
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-11169-1041/+2230
| |\ \ \ | | |/ / | | | | | | | | softkeys
| | * | S60Style: Facelift for panels. It now uses settings page frame graphics sans ↵Sami Merilä2009-05-113-48/+59
| | | | | | | | | | | | | | | | center piece instead of multicolored lines (aka windows95 look). The new frame is drawn slightly smaller than generic frames to ensure that the background shines through between frame border and widgets.
| | * | Enable symbol visibility when compiling with RVCT.axis2009-05-112-3/+3
| | | | | | | | | | | | | | | | | | | | This takes advantage of new functionality in RVCT 2.2, and requires build 671 beta or later.
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-11149-737/+1540
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
| | | * | Fixes qt3support unit tests generating compile failures when Qt is notRohan McGovern2009-05-1153-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured with qt3support. The build system knows when qt3support was turned off, so let's just skip these tests in that case. That makes more sense than individually configuring each autotest machine to skip these tests when the configuration is known to turn off qt3support, which is what's done previously. Reviewed-by: Lincoln Ramsay
| | | * | Prevented asynchronous access to non-thread safe libfontconfig API.Samuel Rødal2009-05-081-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to protect calls to FcCharSetHasChar with the font database mutex. Task-number: 241361 Reviewed-by: Simon Hausmann
| | | * | Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice
| | | * | macx-g++42 spec linker was gcc instead of gcc-4.2João Abecasis2009-05-083-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better alternative to 9ffcf3737901c49acb1a1bc6b65572d195d78a5d Task-number: 253052 Reviewed-by: Norwegian Rock Cat Reviewed-by: MortenS
| | | * | QDataStream: Small doc errorMarkus Goetz2009-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 253179 Reviewed-by: TrustMe
| | | * | Fixes a crash in QPrinterDialog with relative filenamesJoão Abecasis2009-05-083-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's better to set the sourceModel in the constructor for QFSCompletor, as requiring that it be set separately is error prone. Surprisingly, the printer dialog crash only appears to happen when using relative filenames. Task-number: 253135 Reviewed-by: alexis
| | | * | Fix QCompleter with UnfilteredPopupCompletionJoão Abecasis2009-05-082-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced in a794ded85f74516239a08cf848e6b4f8b6dcac6a. When using UnfilteredPopupCompletion the matchCount is always zero and completion was being skipped. By adding the check for showAll we still avoid the assert but retain correct behavior. Task-number: 253125 Reviewed-by: jasplin
| | | * | Fix leak of file descriptors in QTemporaryFileJoão Abecasis2009-05-083-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using setFileName in QFile::copy (introduced recently) has a nasty side-effect of leaking file descriptors in QTemporaryFile. This happens because the code assumes the file has been closed. In QTemporaryFile, we need to explicitly call native file engine close. Test case by Thiago. Bug report from Arora developers. Reviewed-by: thiago
| | | * | compile?Harald Fernengel2009-05-081-1/+1
| | | | |
| | | * | Added further explanation on the note about stdin and QTextsStream::atEnd()Morten Engvoldsen2009-05-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explained why you cannot use stdin and atEnd() together. Task-number:251171 Rev-by: Andreas Aardal Hanssen
| | | * | Fix reentrency of the QCSS engine.Olivier Goffart2009-05-081-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextDocument which is suposed to be reentrant may use the CSS Parser in different threads. The way the indexOfId was computed is not thread safe. Insert the pre-computed value instead Reviewed-by: Thierry