summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0134-2111/+8835
|\
| * Some optimizations for QImage::load()Jens Bache-Wiig2010-06-011-2/+9
| * fix setRawData()Oswald Buddenhagen2010-06-011-1/+1
| * Fix QML crashes on the N900Simon Hausmann2010-06-011-0/+8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0131-2108/+8817
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-0149-49/+259
| | |\
| | | * Fix build failure on Symbian 3.1.Aaron McCarthy2010-06-011-2/+2
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0128-2106/+3684
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-3128-2106/+3684
| | | | |\
| | | | | * Add the Qt::TextBypassShaping flag.Jocelyn Turcotte2010-05-317-1/+67
| | | | | * QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.Jocelyn Turcotte2010-05-311-1/+1
| | | | | * Add my 4.7.0 changesLeonardo Sobral Cunha2010-05-311-0/+6
| | * | | | doc: Added DITA XML generatorMartin Smith2010-06-012-0/+5131
| | | |_|/ | | |/| |
| | * | | qdoc: Added DITA XML generatorMartin Smith2010-05-313-3/+116
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-318-2058/+3458
| | |\ \ \
| | | * | | update Russian translations for Qt toolsRitt Konstantin2010-05-315-525/+508
| | | * | | update Russian translation for Qt librariesRitt Konstantin2010-05-312-1529/+2949
| | | * | | QXmlSchema documentation correctionPeter Hartmann2010-05-311-4/+1
| | * | | | doc: Fixed confusing ownership issue.Martin Smith2010-05-311-4/+4
| | |/ / /
| | * | | doc: Changed last breadcrumb to not be a link.Martin Smith2010-05-311-33/+16
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-31170-2745/+5863
| | |\ \ \
| | | * | | QNetworkCookie: do not accept cookies with non-alNum domainPeter Hartmann2010-05-312-0/+8
| | | * | | QtDeclarative: Remove trailing commas in enumsThiago Macieira2010-05-313-3/+3
| | | * | | Doc: MonotonicClock is obviously monotonicThiago Macieira2010-05-311-1/+1
| | * | | | doc: Fixed reference to setSize(), which is in QRectF.Martin Smith2010-05-311-2/+4
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-017-78/+148
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Doc: Fixed a typoGeir Vattekar2010-06-011-1/+1
| * | | | | Doc: QAbstractItemModel: note unexpected behavior with beginMoveRowsJohn Brooks2010-06-011-40/+52
| * | | | | Added environment variable graphicssystem switch.Andreas Hartmetz2010-06-011-3/+14
| * | | | | Fixed a problem where QPixmaps where re-bound in non-sharing contexts.Trond Kjernåsen2010-06-012-20/+67
| * | | | | Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.Andreas Aardal Hanssen2010-06-011-13/+6
| * | | | | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
| * | | | | Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().Andreas Aardal Hanssen2010-06-011-1/+4
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0134-204/+529
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-012-3/+19
| |\ \ \ \ \
| | * | | | | Documentation.Michael Brasser2010-06-011-1/+16
| | * | | | | Optimization for sci file loading.Michael Brasser2010-06-011-2/+3
| * | | | | | Missed file.Warwick Allison2010-06-011-0/+8
| |/ / / / /
| * | | | | Ensure text color set by S60 input method works for QML ItemsMartin Jones2010-06-011-8/+33
| * | | | | License.Warwick Allison2010-06-011-0/+41
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0161-321/+599
| |\ \ \ \ \
| | * | | | | Test positionAt.Warwick Allison2010-06-011-0/+43
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-0160-320/+555
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0128-188/+323
| | | |\ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | | * | | | | Fix example code and imageBea Lam2010-06-011-0/+0
| | | * | | | | Fix docYann Bodson2010-06-011-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-313-226/+174
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3125-183/+317
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | * | | | | | Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3