summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-122-0/+26
|\
| * Bug: TextEdit ignores plain text format when pasting textYann Bodson2010-10-122-0/+26
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-1235-66/+393
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1169-71/+752
| |\
| | * Fix autotest on windowsAaron Kennedy2010-10-112-1/+18
| | * Test for absent qmldirAaron Kennedy2010-10-112-0/+3
| | * Allow objectName to be used in QML bindingsAaron Kennedy2010-10-116-13/+93
| | * Install the declarative objectNameChanged callbackAaron Kennedy2010-10-112-0/+6
| | * Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-115-7/+64
| | * Add a declarative callback for when a QObject's objectName changesAaron Kennedy2010-10-112-0/+7
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0856-51/+562
| | | | |\
| * | | | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-115-10/+105
| |\ \ \ \ \
| | * | | | | Making the hybrid allocator change compatible across all 4.7.xmread2010-10-112-1/+89
| | * | | | | Spectrum demo: only use --rpath for linux-g++* mkspecsGareth Stockwell2010-10-111-1/+1
| | * | | | | Spectrum demo: put binaries into correct locations on WindowsGareth Stockwell2010-10-113-8/+15
| | |/ / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-111-5/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-094-7/+26
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Add missing data for the autotest of in-place conversion for PixmapBenjamin Poulain2010-10-091-0/+0
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-093-7/+26
| | |\ \ \ | |/ / / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-083-7/+26
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-082-1/+16
| | | * | Fix infinite loop when justifying undisplayable Arabic textEskil Abrahamsen Blomfeldt2010-10-081-6/+10
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-088-19/+54
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Account for native child widgets when handling focus eventsGareth Stockwell2010-10-081-3/+4
| | * | | Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-084-2/+38
| | * | | Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | * | | Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-081-4/+5
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.Jason Barron2010-10-081-4/+5
| |/ /
* | | Update sections if model content changes.Martin Jones2010-10-125-3/+75
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-0854-508/+931
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0853-50/+487
| |\ \ | | |/ | |/|
| | * Allow aliases to value type propertiesAaron Kennedy2010-10-0815-12/+147
| | * Image.sourceSize is incorrect after changing Image.sourceYann Bodson2010-10-083-8/+41
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-088-58/+90
| |\ \
| | * | Fix crash when using Q_GLOBAL_STATIC(QWidget...)Jason Barron2010-10-072-1/+42
| | * | Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-077-57/+48
| * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-081-0/+1
| |\ \ \
| | * \ \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-071-0/+1
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-071-0/+1
| | | |\ \ \
| | | | * | | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0724-427/+638
| |\ \ \ \ \ \
| | * | | | | | Live texture updates to meegographicssystem helper.Michael Dominic K2010-10-0711-406/+197
| | * | | | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| | * | | | | | Revert the integration of the merge request 2286.Benjamin Poulain2010-10-0723-1496/+2798
| | * | | | | | Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0727-2817/+1632
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |