summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-2244-402/+1755
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-2222-46/+45
| |\
| | * Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-2178-513/+2392
| | |\
| | * | Bump Qt version to 4.7.4Timo Turunen2011-03-2121-41/+57
| | * | Fix endianness detection with gcc 4.6 -flto -fwhole-programBernhard Rosenkraenzer2011-03-211-4/+4
| | * | remove redundand validateModes() callOswald Buddenhagen2011-03-211-1/+0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-222-4/+7
| |\ \ \
| | * | | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
| | * | | Remove incorrect check in qpixmap autotest.Laszlo Agocs2011-03-211-3/+6
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-221-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't crash calling QTextDocument::blockBoundingRect on invalid blockEskil Abrahamsen Blomfeldt2011-03-211-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-219-151/+174
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-s60-public into 4.7Laszlo Agocs2011-03-211-0/+31
| | |\ \ \
| | | * | | Started changes-4.7.4 fileEckhart Koppen2011-03-211-0/+31
| | * | | | Change the pooled QGLPixmapData to be backed by QVolatileImage.Laszlo Agocs2011-03-215-141/+128
| | |/ / /
| | * | | Changed s60 style not to rely on QPixmapData::toNativeType().Laszlo Agocs2011-03-212-7/+6
| | * | | Add missing bitmap locking to QVGPixmapData::fromNativeType.Laszlo Agocs2011-03-211-2/+4
| | * | | Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.Laszlo Agocs2011-03-211-1/+5
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-213-9/+29
| |\ \ \ \
| | * | | | Fix writing to an attached property from script.Michael Brasser2011-03-213-9/+29
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-2127-225/+1535
| |\ \ \ \ \ | | |/ / / /
| | * | | | fixes/improvements for new QML right-to-left docsBea Lam2011-03-2113-108/+152
| | * | | | Fix license headers in example codeBea Lam2011-03-211-1/+41
| | * | | | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-1822-186/+1412
| | * | | | Doc fix - QtQuick 1.1 schedulingBea Lam2011-03-181-1/+1
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-2212-22/+93
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-2012-22/+93
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-195-14/+34
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| | | * | | | Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-196-7/+58
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-186-7/+58
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-191-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-223-5/+17
|\ \ \ \ \ \ \
| * | | | | | | Designer: Remember default of main container's object name.Friedemann Kleint2011-03-212-3/+15
| * | | | | | | Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2011-03-211-2/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-2253-915/+2565
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-21440-4580/+19637
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-196-26/+234
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-196-26/+234
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-183-5/+76
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
| | | * | | | | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| | | * | | | | | Clipboard/Windows: Fix a hang when sending to non-responsive clients.Friedemann Kleint2011-03-171-2/+13
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-183-21/+158
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-172-0/+100
| | | * | | | | | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-172-21/+58
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-192-4/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-182-4/+5