summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-0643-335/+549
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0643-335/+549
| |\
| | * Designer: Fix action editor scrolling.Friedemann Kleint2010-09-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | In overwritten virtual QAbstractItemView::currentChanged, invoke base implementation. Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Task-number: QTCREATORBUG-2249
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-063-7/+42
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add test for ListView positioning when all visible items are removed. Complete Component::createObject() creation after setting the parent. Keep ListView position sensible when all visible items are removed.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-0516-302/+162
| | | |\ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-034-190/+42
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compilation of the modelview tutorial on Windows. qdrawhelper: micro optimisation in fetchTransformBilinear Fix QStaticText copy constructor to also copy text option property qdrawhelper: Remove blend_transformed_bilinear_argb
| | | * | Fixed compilation of the modelview tutorial on Windows.Kim Motoyoshi Kalland2010-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | * | qdrawhelper: micro optimisation in fetchTransformBilinearOlivier Goffart2010-09-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the -1 out of the loop Reviewed-by: Benjamin Poulain
| | | * | Fix QStaticText copy constructor to also copy text option propertyEskil Abrahamsen Blomfeldt2010-09-032-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text option property of QStaticText was not copied in the copy constructor, so when the text was detached, the property would be reset to the default. Task-number: QTBUG-13368 Reviewed-by: Gunnar
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-021-179/+4
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: qdrawhelper: Remove blend_transformed_bilinear_argb
| | | | * | qdrawhelper: Remove blend_transformed_bilinear_argbOlivier Goffart2010-09-021-179/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the recent optimisation in fetchTransformedBilinear, the generic path is faster than the 'optimized' path Reviewed-by: Samuel
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-0310-85/+95
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QToolbar button and checked state is not shown Plug memory leak from QS60Style Fix Symbian handling of projects with special characters in TARGET Added missing code to bring web browser foreground in Symbian.
| | | * | | | QS60Style: QToolbar button and checked state is not shownSami Merila2010-09-031-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style ignores Style_On state for QToolButton drawing. This has been fixed, so that when toolbutton is "on", button is drawn with pressed down graphics. Task-number: QTBUG-13099 Reviewed-by: Alessandro Portale
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-037-75/+78
| | | |\ \ \ \
| | | | * | | | Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-036-75/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plenty of filenames got generated with spaces which didn't work as that was not taken into account. Harmonized TARGET fixing across prf files and qmake Symbian generator code. Task-number: QTBUG-13363 Reviewed-by: Thomas Zander
| | | | * | | | Added missing code to bring web browser foreground in Symbian.Janne Anttila2010-09-031-0/+1
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8336 Reviewed-by: Miikka Heikkinen
| | | * | | | Plug memory leak from QS60StyleSami Merila2010-09-033-0/+10
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently style leaks an animation object (QS60StyleAnimation) when style is destroyed. To avoid this, animation object array is deleted in the style's destructor. Task-number: QTBUG-13145 Reviewed-by: mread
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0314-37/+138
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Cleanup visible item checking in positioners Missing file Fix the same bug that was in the demo samegame, in the tutorial version qreal == float fixes Don't modify the signal order on the second dynamic meta object pass Doc Support passing QObject derived types to QML methods
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-09-0316-21/+280
| | | |\ \ \
| | | * | | | Cleanup visible item checking in positionersAlan Alpert2010-09-031-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially in Grid, where it wasn't being done right. Task-number: QTBUG-12610 Reviewed-by: Martin Jones
| | | * | | | Fix the same bug that was in the demo samegame, in the tutorial versionAlan Alpert2010-09-031-2/+2
| | | | |/ / | | | |/| |
| | | | | * Add test for ListView positioning when all visible items are removed.Martin Jones2010-09-051-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12664
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-03170-2119/+3227
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Missing fileAaron Kennedy2010-09-031-0/+14
| | | | | |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-034-11/+167
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-039-8/+97
| | | | | |\ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't modify the signal order on the second dynamic meta object pass Doc Support passing QObject derived types to QML methods
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-024-11/+167
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian: return better default font for SansSerif style hint Removing a left over #if 1..#endif construct Fixed a few warnings. Fixed a bug where passwords would not be committed when confirming.
| | | * | | | Symbian: return better default font for SansSerif style hintAlessandro Portale2010-09-021-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest QtWebkit will use QFont::defaultFamily() with style hints to ask for the appropriate default fonts on a system. This patch makes sure thath "Nokia Sans S60" and "Series 60 Sans" are prioritized for QFont::SansSerif, if they are present. Task-Number: QTBUG-12611
| | | * | | | Removing a left over #if 1..#endif constructAlessandro Portale2010-09-021-8/+1
| | | | | | |
| | | * | | | Fixed a few warnings.axis2010-09-021-3/+1
| | | | | | |
| | | * | | | Fixed a bug where passwords would not be committed when confirming.axis2010-09-023-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happened when you were typing a password and pressing "Done" softkey very quickly. Because of the temporarily visible character, the widget would not contain the full string at the time of softkey triggering, only the *** part. Fixed by having the input context listen for softkey (command) events and commit the temporary character before the softkey action is triggered. AutoTest: Included Task: QTBUG-12949 RevBy: Miikka Heikkinen
| | | | * | | qreal == float fixesAaron Kennedy2010-09-032-2/+2
| | | | |/ / | | | | | | | | | | | | | | | | | | QTBUG-11853
| | | | * | Don't modify the signal order on the second dynamic meta object passAaron Kennedy2010-09-032-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-13374
| | | | * | DocAaron Kennedy2010-09-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-12665
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-0322-148/+300
| | | | |\ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-026-10/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix broken S60 build Keep mirrored char handling consistent between some font engines Fix symbol font detection in generic CMap decoding Minor performance improvement to QGraphicsItem::update.
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-027-3/+61
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Document known limitations in UI performance on S60 5.0 based devices. Update QDesktopWidget geometry when S60 furniture visibility changes Prevent null pointer dereference
| | | * | | | Document known limitations in UI performance on S60 5.0 based devices.Jani Hautakangas2010-09-025-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11333 Reviewed-by: axis
| | | * | | | Update QDesktopWidget geometry when S60 furniture visibility changesGareth Stockwell2010-09-022-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13204 Reviewed-by: axis
| | | * | | | Prevent null pointer dereferenceGareth Stockwell2010-09-021-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13204 Reviewed-by: axis
| | | | * | Support passing QObject derived types to QML methodsAaron Kennedy2010-09-036-4/+67
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-13047
| | | | | * Complete Component::createObject() creation after setting the parent.Martin Jones2010-09-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13170 Reviewed-by: Alan Alpert
| | | | | * Keep ListView position sensible when all visible items are removed.Martin Jones2010-09-031-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would always jump back to 0. Now it stays at the nearest remaining index. Task-number: QTBUG-12664
* | | | | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-065-36/+93
| | | | | |
* | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0389-634/+2028
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0289-632/+2028
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix broken S60 buildJiang Jiang2010-09-022-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Liang Qi
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-025-10/+3
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Keep mirrored char handling consistent between some font engines Fix symbol font detection in generic CMap decoding Minor performance improvement to QGraphicsItem::update.
| | | * | | Keep mirrored char handling consistent between some font enginesJiang Jiang2010-09-023-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirrored character subsitution should be used in right-to-left text direction unless the font is a symbol font. This patch will keep this behavior consistent between FreeType, QPF and S60 font engines. For Mac font engines, the shaping process is delegated to Core Text or ATSUI, so we don't do mirrored char handling by ourselves. Task-number: QTBUG-3852 Reviewed-by: Lars Knoll
| | | * | | Fix symbol font detection in generic CMap decodingJiang Jiang2010-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For fonts that have an AppleRoman name table, *isSymbolFont failed to return correct value even if they have a symbol table. This patch corrected this behavior by using symbolTable variable to detect that instead of checking if score == Symbol. Also prefer symbol table over AppleRoman table to make generic CMap decoding consistent with QFontEngineFT (which will use the symbol table whenever its available). Task-number: QTBUG-3852 Reviewed-by: Lars Knoll
generated by cgit v0.12 at 2024-11-23 09:07:32 (GMT)