summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-054-28/+79
|\
| * 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
| * Turned off input methods on Windows when using certain hints.axis2009-06-051-1/+6
| * 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 ta...Sami Merilä2009-06-051-0/+10
| | * 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
| * | | Added subElementRect implementation for SE_ItemViewItemCheckIndicator.Janne Anttila2009-06-051-0/+2
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-052-3/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Made Selection updates relative to the block.axis2009-06-051-2/+3
| |/ /
| * | Compile on newer SDKs >= S60 5.0.Jason Barron2009-06-051-1/+1
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-0519-309/+922
|\ \ \ | |/ /
| * | Enabling QGraphicsTextItem to handle input method events.Aleksandar Sasha Babic2009-06-051-1/+128
| * | 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
| | |/
| | * 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
| | * 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
| | | * | 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
| | | | * Fixed an update bug in QTextControl.axis2009-06-031-0/+3
| | | | * Gave QTextControl support for ImAnchorPosition and Selection.axis2009-06-031-3/+23
| | | | * Added inputMethodQuery fallback to QWidget.axis2009-06-031-0/+3
| | | | * Fixed a small input method bug in QLineEdit.axis2009-06-031-1/+2
| | | * | 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
| * | | Introduce Symbian CFbsBitmap <-> QPixmap conversion functions.Jason Barron2009-06-052-6/+143
| * | | Fix up the display mode conversion function.Jason Barron2009-06-041-31/+34
| * | | Implement a dummy QColorMap for Symbian.Jason Barron2009-06-042-1/+114
| | |/ | |/|
* | | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into s...Markku Luukkainen2009-06-053-23/+22
|\ \ \
| * | | 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
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-03119-998/+2873
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | 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