summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-163-34/+73
|\
| * Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()Eskil Abrahamsen Blomfeldt2010-02-162-22/+34
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-161-1/+1
| |\
| * | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-162-12/+39
* | | Fix license headers.Jason McDonald2010-02-163-54/+54
| |/ |/|
* | Fixed a compile error on Mac/Leopard.Trond Kjernåsen2010-02-161-1/+1
|/
* Fix alpha check for OpenGL/ES in GL2 paint engineRhys Weatherley2010-02-151-0/+4
* Compile fix for QStaticText - include declaration of QColorRhys Weatherley2010-02-151-0/+1
* Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-15365-211/+106877
|\
| * Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13338-269/+107080
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-131-1/+1
| | |\
| | | * add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-131-2/+7
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-124-12/+29
| | | |\ \ | | | | |/
| | | * | Fix scrolling backwards when pathItemCount != model.countAlan Alpert2010-02-121-2/+7
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-131-2/+12
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Enabled searching of IM plugins on Symbian.axis2010-02-121-2/+12
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-12317-109/+106597
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Fix warningsAaron Kennedy2010-02-124-6/+2
| | | * Reference count shared expression dataAaron Kennedy2010-02-122-1/+7
| | | * Cleanup public QmlMetaType APIAaron Kennedy2010-02-1212-158/+112
| | | * Adds inputMethodHint property to TextEdit and TextInput.Joona Petrell2010-02-122-0/+3
| | | * Decouple Loader from QmlGraphicsItemJoona Petrell2010-02-124-38/+119
| | | * Explicitly pass size to standard pixmap icon loaders.Michael Brasser2010-02-121-95/+95
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-11316-14/+106462
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-11316-14/+106462
| | | | |\
| | | | | * Update QmlChanges.txtLeonardo Sobral Cunha2010-02-111-0/+2
| | | | | * Animations are running by default when used as property source valueLeonardo Sobral Cunha2010-02-112-2/+11
| | | | | * QML Object toString should use 64-bit address on 64-bit platformsAaron Kennedy2010-02-111-1/+1
| | | | | * Fix tst_qmlecmascript::callQtInvokablesAaron Kennedy2010-02-111-6/+8
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-10316-14/+106449
| | | | | |\
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-102-9/+16
| | | | | | |\
| | | | | | | * Make sure item release isn't deferred indefinatelyMartin Jones2010-02-102-9/+16
| | | | | | * | Attempt to clairify highlight range docsAlan Alpert2010-02-101-0/+10
| | | | | | |/
| | | | | | * CrashAaron Kennedy2010-02-101-0/+2
| | | | | | * Revert "Remove unimplemented methods from header"Martin Jones2010-02-101-0/+2
| | | | | | * Revert "Replace QList<>* support with QmlListProperty"Martin Jones2010-02-1019-215/+318
| | | | | | * A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-09315-11/+106320
| | | | | | |\
| | | | | | | * Remove unimplemented methods from headerKai Koehne2010-02-091-2/+0
| | | | | | | * Properly insert objects into the context's object listAlan Alpert2010-02-091-0/+1
| | | | | | | * Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-0919-318/+215
| | | | | | | * Remove old implicit module support.Warwick Allison2010-02-092-14/+16
| | | | | | | * Use networkAccessManagerFactory() for worker threads too.Martin Jones2010-02-092-14/+20
| | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0810-558/+183
| | | | | | | |\
| | | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-085-511/+93
| | | | | | | | |\
| | | | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-08314-9/+106365
| | | | | | | | | |\
| | | | | | | | | | * Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectTypeMarco Bubke2010-02-082-1/+23
| | | | | | | | | | * Changed define name to reflect change in Creator.Erik Verbruggen2010-02-081-2/+2
| | | | | | | | | | * re-enable QT_USE_FAST_CONCATENATIONErik Verbruggen2010-02-081-1/+1