summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-054-28/+79
|\ | | | | | | softkeys
| * S60Style: Remove some magic numbers.Sami Merilä2009-06-051-7/+10
| |
| * S60Style: Missing break-statementSami Merilä2009-06-051-0/+1
| |
| * S60Style: More styleHintsSami Merilä2009-06-051-1/+27
| |
| * Prevent double deletion of m_themePaletteAlessandro Portale2009-06-052-16/+20
| | | | | | | | RevBy: Sami Merila
| * Turned off input methods on Windows when using certain hints.axis2009-06-051-1/+6
| | | | | | | | | | If any of those hints are present, complex input is not possible, so input methods should be turned off on Windows.
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-06-053-5/+16
| |\
| | * S60Style: Drop middlesection from tab graphics, if there is very little of ↵Sami Merilä2009-06-051-0/+10
| | | | | | | | | | | | tab content.
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-058-42/+419
| | |\
| | * | Cut the process priority lowering timeout to 100ms in Symbian eventdispatcher,Miikka Heikkinen2009-06-051-3/+3
| | | | | | | | | | | | | | | | as some demos were getting ViewSrv 11 panics with 500ms timeout.
| * | | Added subElementRect implementation for SE_ItemViewItemCheckIndicator.Janne Anttila2009-06-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | S60Style did not implement SE_ItemViewItemCheckIndicator if given option was somethign else than QStyleOptionViewItemV4. This causes some autotests to fail. Added appropriate query for QCommonStyle.
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-052-3/+4
|\ \ \ \ | | |_|/ | |/| | | | | | softkeys
| * | | Made Selection updates relative to the block.axis2009-06-051-2/+3
| |/ / | | | | | | | | | | | | Otherwise the update would always end up with the selection being in the first block.
| * | Compile on newer SDKs >= S60 5.0.Jason Barron2009-06-051-1/+1
| | | | | | | | | | | | Semi-colons, colons, they all look the same to me.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-0519-309/+922
|\ \ \ | |/ / | | | | | | softkeys
| * | Enabling QGraphicsTextItem to handle input method events.Aleksandar Sasha Babic2009-06-051-1/+128
| | | | | | | | | | | | On S60 one should get virtual keyboard.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-06-0513-270/+507
| |\ \
| | * | Turned off input methods on X11 when using certain hints.axis2009-06-051-1/+1
| | |/ | | | | | | | | | | | | If any of those hints are present, complex input is not possible, so input methods should be turned off on X11.
| | * Set UID for QtScriptToolsMartin Jones2009-06-051-0/+2
| | |
| | * Loading fonts from other /resource/fonts folders than the one on Z:Alessandro Portale2009-06-041-4/+40
| | | | | | | | | | | | | | | | | | Order is 'soft to hard' W:, X: ... A:, Z: Duplicated font file names are ignored. That should imitate the font loading behaviour in the fbSrv.
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-06-04137-1546/+3712
| | |\
| | | * S60Style: Buildbreak fix. Remove problematic #ifdef line.Sami Merilä2009-06-041-2/+0
| | | |
| | | * S60Style: Missing constantSami Merilä2009-06-041-0/+1
| | | |
| | | * S60Style: Cleanup code before Tower release.Sami Merilä2009-06-042-233/+229
| | | |
| | | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-041-0/+15
| | | |\
| | | | * In QGraphicsView the viewport itself has to be enabled for InputMethods.Aleksandar Sasha Babic2009-06-041-0/+15
| | | | | | | | | | | | | | | | | | | | When events are comming, exactly that widget will be aske for InputContext.
| | | * | Added proper UID for phonon.pro, and did some symbian scope cleanup, too.Miikka Heikkinen2009-06-041-8/+10
| | | |/
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicSami Merilä2009-06-047-12/+166
| | | |\
| | | | * Added loadS60ThemeFromBlob and saveS60ThemeToBlob.Alessandro Portale2009-06-034-8/+135
| | | | | | | | | | | | | | | | | | | | The simulated style will by default try to load the 'Default.blob'
| | | | * Fixed an update bug in QTextControl.axis2009-06-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Previously, the input context would not get updated on every selection update.
| | | | * Gave QTextControl support for ImAnchorPosition and Selection.axis2009-06-031-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me The fix is almost identical to the one made for QLineEdit.
| | | | * Added inputMethodQuery fallback to QWidget.axis2009-06-031-0/+3
| | | | |
| | | | * Fixed a small input method bug in QLineEdit.axis2009-06-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | We need to check for replacementLength as well. Otherwise there will be no undo information if text is deleted using input methods.
| | | * | S60Style: Draw all dialog with popup menu theme background.Sami Merilä2009-06-041-12/+7
| | | |/
| | * | Correctly scope local variables in switch statement (for GCC 4.3)Iain2009-06-041-0/+38
| | | |
| * | | Make QColormap::instance() not crash.Jason Barron2009-06-051-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't really need a static instance lying around and this current implementation crashes since we never call the constructor. Just recreate it on the fly when instance() is called which apparently is never.
| * | | Introduce Symbian CFbsBitmap <-> QPixmap conversion functions.Jason Barron2009-06-052-6/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce functions for converting to and from a CFbsBitmap on Symbian. Currently these functions unfortunately have to copy the data to the internal QImage stored in the raster pixmap data backend :( Hopefully we can improve this with a native Symbian pixmap backend in the future. The autotest generates both small and large CFbsBitmaps of different formats and then verifies that the color makes it into the QPixmap. Currently the indexed image formats don't seem to work, but this is most likely because we don't set a palette for them. The semi-trans bitmaps seem to work fine (verified visually), but the current QCOMPARE doesn't consider the fact that the color was alpha blended. Reviewed-by: Sami Merilä
| * | | Fix up the display mode conversion function.Jason Barron2009-06-041-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Few things here: - Add support for EGray2 and EGray256 - Change the define to disable EColor16MAP for old SDKs - Make the default case return Invalid instead of a fatal error - Fix indentation, tabs -> spaces
| * | | Implement a dummy QColorMap for Symbian.Jason Barron2009-06-042-1/+114
| | |/ | |/| | | | | | | | | | | | | | | | It seems that this class has been completely forgotten until now, but this never causes any problems because apparently no one uses it. Provide a quick little implementation to get things linking. Implementation brought to you courtesy of Qt/Mac.
* | | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-053-23/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp
| * | | Adding and removing a 'Cancel' SoftKeyAlessandro Portale2009-06-031-2/+14
| | | |
| * | | Fix mergeAlessandro Portale2009-06-031-2/+1
| | | |
| * | | Resolving merge conflictsAlessandro Portale2009-06-03119-1018/+2881
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicAlessandro Portale2009-06-0360-99/+1816
| | |\ \
| | * | | Fixed QFontEngineS60::boundingBox. It was actually returning the tightAlessandro Portale2009-06-031-20/+7
| | | | | | | | | | | | | | | | | | | | bounding rect, before.
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-03119-998/+2873
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp
| * | | Merge branch 'imSelections'axis2009-06-0359-70/+1738
| |\ \ \
| | * | | Made S60 FEP use the new Qt::ImAnchorPosition API.axis2009-06-031-3/+2
| | | | |
| | * | | Made S60 FEP use the new QInputMethodEvent::Selection API.axis2009-06-031-4/+4
| | | | |
| | * | | Made QLineEdit respect the new Qt::ImAnchorPosition.axis2009-06-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me AutoTest: Will add in later commit
generated by cgit v0.12 at 2025-01-08 16:56:47 (GMT)