summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-1921-148/+153
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-184-44/+35
| |\
| | * Fix bug when resetting QSortFilterProxyModelStephen Kelly2010-03-181-2/+2
| | * Fix the QSplitter not showing correctly in QGraphicsViewThierry Bastian2010-03-181-20/+15
| | * fix a crash when registering 2 metatype name for the same actual typeThierry Bastian2010-03-181-11/+7
| | * Fixed problem in painting of QTreeViewThierry Bastian2010-03-181-11/+11
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-1817-104/+118
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-1817-104/+118
| | |\
| | | * Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-1817-104/+118
* | | | Fixed install of qml imports when doing a vcproj build.Rohan McGovern2010-03-191-1/+1
* | | | Remove warningsYann Bodson2010-03-182-29/+31
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18135-2737/+4789
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18135-2737/+4789
| |\ \ \ | | |/ / | |/| |
| | * | Add missing semicolons. moc was confused and positionViewAtIndex not invokable.Yann Bodson2010-03-182-2/+2
| | * | Use the correct base URL in resolveUriMartin Jones2010-03-181-3/+2
| | * | Optimize id checking.Warwick Allison2010-03-181-10/+0
| | * | Don't use QScriptValueIterator to iterate over arrays.Bea Lam2010-03-181-4/+3
| | * | Only release the binding once we're finished with its memoryAaron Kennedy2010-03-181-1/+1
| | * | Make it harder to accidentally delete a bindingAaron Kennedy2010-03-181-5/+7
| | * | Block modifications to internal QDeclarativeContextsAaron Kennedy2010-03-181-1/+19
| | * | Another fix to findmae2010-03-171-3/+5
| | * | Improve implicit "." importmae2010-03-172-16/+28
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-17135-2721/+4751
| | |\ \
| | | * | Fix auto testmae2010-03-171-8/+8
| | | * | Fix type lookup with urlmae2010-03-171-8/+8
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-17432-10292/+23857
| | | |\ \
| | | * | | Fix default values on TextinputAlan Alpert2010-03-171-0/+3
| | | * | | Add an implicit import "." to types loaded from a local urlmae2010-03-172-4/+28
| | | * | | Fix crashAaron Kennedy2010-03-173-8/+9
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-171-14/+16
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-172-9/+19
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-175-4/+60
| | | | |\ \ \ \
| | | | * | | | | Emits itemsRemoved() in QDeclarativeListModel::remove.Yann Bodson2010-03-171-14/+16
| | | * | | | | | Don't use Qt3 support methods.Martin Jones2010-03-171-1/+1
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | CrashAaron Kennedy2010-03-172-9/+19
| | | | |/ / / | | | |/| | |
| | | * | | | Allow enum constants as list element properties.Warwick Allison2010-03-175-4/+60
| | | |/ / /
| | | * | | Really fix warning.Martin Jones2010-03-171-2/+2
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-173-6/+7
| | | |\ \ \
| | | | * | | MouseArea works now with any QGraphicsObjectAlexis Menard2010-03-172-6/+6
| | | | * | | Register QGraphicsWidget type.Alexis Menard2010-03-171-0/+1
| | | * | | | Fix warnings.Martin Jones2010-03-172-2/+2
| | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1740-581/+828
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-1738-574/+826
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-17133-2690/+4575
| | | | | |\ \ \
| | | | | | * | | One url for an *unqualilfied* import is not special.Warwick Allison2010-03-171-1/+2
| | | | | | * | | Fix test failuresAaron Kennedy2010-03-176-6/+11
| | | | | | * | | Optimization: Don't unnecessarily run VMEStack element constructorsAaron Kennedy2010-03-171-4/+4
| | | | | | * | | Optimization: Reduce unnecessary QObject allocationsAaron Kennedy2010-03-1731-550/+740
| | | | | | * | | Reset QDeclarativeDeclarativeData::outerContext when the context is removedAaron Kennedy2010-03-171-0/+1
| | | | | | * | | Simplify QDeclarativeComponent::creationContext() logicAaron Kennedy2010-03-171-5/+2