Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-18 | 2 | -2/+10 |
|\ | |||||
| * | Alternative fix to the strict-aliasing violation warnings | Thiago Macieira | 2011-04-18 | 1 | -1/+9 |
| * | Revert "Fix strict-alias breaking warnings with GCC." | Thiago Macieira | 2011-04-18 | 1 | -72/+43 |
| * | Fix warning about vSize not being used in this function | Thiago Macieira | 2011-04-17 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-04-14 | 14 | -102/+251 |
| |\ | |||||
| * | | Fix strict-alias breaking warnings with GCC. | Thiago Macieira | 2011-04-14 | 1 | -43/+72 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-04-18 | 3 | -3/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 12 | -98/+224 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 34 | -315/+389 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Compile with QStringBuilder and QByteArray | Olivier Goffart | 2011-04-01 | 1 | -1/+1 |
| * | | | Fix declarative after the last changes to the QObject internals | Olivier Goffart | 2011-03-31 | 2 | -2/+2 |
* | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-12 | 2 | -4/+27 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 2 | -4/+27 |
| |\ \ \ | |||||
| | * | | | Allow enum values to be used as signal parameters | Bea Lam | 2011-04-12 | 1 | -1/+27 |
| | * | | | ListModel::clear() should not clear roles | Bea Lam | 2011-04-12 | 1 | -3/+0 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-08 | 2 | -10/+22 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-07 | 2 | -10/+22 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Image w/ PreserveAspectFit has its width changed once more than needed. | Martin Jones | 2011-04-07 | 2 | -10/+22 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 10 | -88/+202 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-07 | 2 | -1/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug | Kai Koehne | 2011-04-06 | 2 | -1/+9 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-04-06 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-05 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 2 | -2/+4 |
| | |\ \ \ \ | |||||
| | * | | | | | Doc: Fixed markup. | David Boddie | 2011-03-25 | 1 | -2/+2 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 43 | -627/+2218 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-06 | 4 | -81/+186 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Improve Flickable dynamics and allow platform specific tweaking. | Martin Jones | 2011-04-06 | 4 | -81/+186 |
| * | | | | | | | Removing extra comma in `enum' declaration. | Sergio Ahumada | 2011-04-05 | 1 | -1/+1 |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-04 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | XmlListModel should allow types other than application/xml | Bea Lam | 2011-04-04 | 1 | -1/+1 |
| | * | | | | | | Document using Behaviors with States. | Michael Brasser | 2011-04-04 | 1 | -2/+3 |
* | | | | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one place | Jiang Jiang | 2011-04-05 | 2 | -5/+1 |
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-03 | 32 | -302/+388 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-01 | 11 | -117/+184 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-01 | 11 | -117/+184 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | Changing width of RTL positioner doesn't relayout | Martin Jones | 2011-04-01 | 1 | -0/+10 |
| | | * | | | | | PinchArea and Flickable don't work well enough together | Martin Jones | 2011-03-31 | 4 | -111/+146 |
| | | * | | | | | Once Image sourceSize is set there is no way to clear it. | Martin Jones | 2011-03-31 | 3 | -1/+17 |
| | | * | | | | | Canceling image download while reading causes crash | Martin Jones | 2011-03-30 | 3 | -3/+7 |
| | | * | | | | | Fix width of TextInput micro focus rectangle. | Andrew den Exter | 2011-03-30 | 1 | -2/+4 |
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 22 | -185/+204 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-30 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | | |||||
| | | * | | | GridView jumps to beginning of list when resized | Martin Jones | 2011-03-29 | 1 | -1/+1 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-03-27 | 22 | -184/+201 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 36 | -534/+1910 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-09 | 16 | -97/+312 |
| | | |\ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Doc: Small change to ListModel docs | Geir Vattekar | 2011-03-07 | 1 | -1/+1 |
| | | * | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-03-01 | 2 | -2/+2 |
| | | * | | | Merge branch 'mimir' into 4.7 | Martin Smith | 2011-03-01 | 1 | -1/+1 |
| | | |\ \ \ |