summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add runtime_graphics_system flag to QApplicationPrivate.Jani Hautakangas2010-05-286-5/+12
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2824-54/+995
|\
| * Add missign license headers.Jason McDonald2010-05-282-0/+82
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2722-54/+913
| |\
| | * Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-27201-1521/+2729
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2723-56/+915
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2623-56/+915
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7Shane Kearns2010-05-26182-616/+280053
| | | | |\ \
| | | | * | | Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.Liang Qi2010-05-252-2/+17
| | | | * | | Make link on linux/symbianThomas Zander2010-05-251-0/+1
| | | | * | | Fix double slashes on few data caging pathsMiikka Heikkinen2010-05-251-2/+2
| | | | * | | Fix for QRuntimePixmapData serial number setting.Jani Hautakangas2010-05-251-1/+3
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2520-58/+911
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | |\ \ \
| | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2220-58/+911
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-216-14/+140
| | | | | | | | | |\ \ \
| | | | | | | | | * | | | Enable QTouchEvent for S60 5.0Shane Kearns2010-05-213-12/+45
| | | | | | | | | * | | | Add missing license header.Jason McDonald2010-05-211-0/+41
| | | | | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2019-46/+823
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2019-46/+823
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | Fix build error on S60 3.1 environmentsMiikka Heikkinen2010-05-201-2/+2
| | | | | | | | | | | * | | | Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-201616-68573/+33936
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * | | | Fix replacement functions in platform_paths.prfMiikka Heikkinen2010-05-201-2/+0
| | | | | | | | | | | * | | | | QRuntimeGraphicsSystemJani Hautakangas2010-05-2017-42/+821
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2811-48/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Active window focus gain should not open virtual keypadJoona Petrell2010-05-285-6/+27
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-28209-1644/+2959
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Use QElapsedTimer rather than QTime::elapsed()Martin Jones2010-05-286-42/+58
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-288-102/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-278-102/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Wrong QGraphicsItem::childrenBoundingRect() when applying effects.Bjørn Erik Nilsen2010-05-272-3/+32
| | * | | | | | | | | | | | | | | | | Fix a bug in QDirectFBPixmapData::fromImageAnders Bakken2010-05-272-16/+11
| | * | | | | | | | | | | | | | | | | Replace memmove with memcpyEskil Abrahamsen Blomfeldt2010-05-271-6/+6
| | * | | | | | | | | | | | | | | | | Fixed compilation of QtOpenGL.Samuel Rødal2010-05-272-2/+2
| | * | | | | | | | | | | | | | | | | Optimize initialization of QStaticTextEskil Abrahamsen Blomfeldt2010-05-272-81/+101
* | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2810-83/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fix escaping - by not using evalOswald Buddenhagen2010-05-273-19/+19
| * | | | | | | | | | | | | | | | | | escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
| * | | | | | | | | | | | | | | | | | fix & unify path separator escapingOswald Buddenhagen2010-05-273-49/+58
| * | | | | | | | | | | | | | | | | | Removed unused variableThorbjørn Lindeijer2010-05-271-1/+0
| * | | | | | | | | | | | | | | | | | Upgrade harfbuzz to the latest versionLars Knoll2010-05-272-13/+25
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2710-188/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-27209-1531/+2875
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Tweak aesthetics of QML viewer inside QtDemoAlan Alpert2010-05-278-175/+118
| * | | | | | | | | | | | | | | | | Add key event handling to the declarative web viewAlan Alpert2010-05-261-13/+8
| * | | | | | | | | | | | | | | | | Improve gradient docsAlan Alpert2010-05-261-0/+4
* | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-277-7/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove superfluous forward declaration.kh12010-05-271-3/+0