summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* git ignore stuffWarwick Allison2010-05-182-0/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1828-42/+49
|\
| * Sometimes you own QNetworkReply, sometimes you don't.Aaron Kennedy2010-05-181-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1825-37/+45
| |\
| | * Rename files; fix test.Michael Brasser2010-05-184-3/+4
| | * Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-1821-34/+41
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1815-108/+179
| |\ \ | | |/
| * | Round correctly in binding optimizerAaron Kennedy2010-05-182-4/+3
* | | Test Qt.labs.folderlistmodel pluginWarwick Allison2010-05-184-0/+136
* | | Fix naming.Warwick Allison2010-05-187-21/+6
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-183-33/+17
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-1817-114/+1322
| |\ \
| | * | Photoviewer example fixes.Yann Bodson2010-05-182-28/+16
| | |/
| * | Don't disable SmoothPixmapTransform in qDrawBorderPixmap()Martin Jones2010-05-181-5/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1815-86/+1306
|\ \ \ | | |/ | |/|
| * | Use QDeclarativeScriptString for ParentChange.Michael Brasser2010-05-1814-85/+1301
| * | Set raster + gl viewport as the default for OS X.Michael Brasser2010-05-181-1/+5
| |/
* | Port from QListModelInterface to QAbstractListModel.Warwick Allison2010-05-182-51/+44
* | Move stuff from QML viewer to plugins.Warwick Allison2010-05-179-22/+95
* | docWarwick Allison2010-05-172-4/+24
* | Fix to work with file: URLs (eg. from qml -qmlbrowser)Warwick Allison2010-05-171-0/+1
|/
* Move xmldata example into rssnews demo.Yann Bodson2010-05-1711-146/+218
* Move Q_ENUMS to start of class declarationAaron Kennedy2010-05-172-3/+3
* Restructure QDeclarativeAbstractBinding destructorAaron Kennedy2010-05-171-2/+4
* Don't call pure virtual method in ~QDeclarativeAbstractBinding()Aaron Kennedy2010-05-171-1/+1
* Fix examples autotest when compiled without webkit or xmlpatternsBea Lam2010-05-171-2/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-17100-958/+2482
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-17416-535/+980
| |\
| | * Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-172-6/+2
| | * Add focus docs snippetsBea Lam2010-05-172-22/+28
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1714-88/+432
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-17401-429/+495
| | | |\
| | | * | Don't crash due to recursive positioning.Martin Jones2010-05-173-27/+65
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-16306-3218/+6499
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-146-16/+18
| | | |\ \ \
| | | * | | | Add a "priority" property to Keys and KeyNavigationMartin Jones2010-05-149-46/+361
| | * | | | | Fix doc for status, add Image::onLoaded.Warwick Allison2010-05-173-5/+29
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1744-590/+1020
| |\ \ \ \ \ \
| | * | | | | | Empty commit to trigger a rebuild in the CI systemThiago Macieira2010-05-160-0/+0
| | * | | | | | Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-1/+1
| | * | | | | | tst_bic: Fix building on Mac 64Thiago Macieira2010-05-151-1/+1
| | * | | | | | Fix building of tst_QTcpSocketThiago Macieira2010-05-151-2/+2
| | * | | | | | Autotest: some improvements to timeout testing of tst_QTcpSocketThiago Macieira2010-05-151-4/+22
| | * | | | | | Revert "Optimized pixmapcache key generation for icons and styles"Thiago Macieira2010-05-153-48/+65
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1544-649/+1044
| | |\ \ \ \ \ \ | |/ / / / / / /
| | * | | | | | Revert "More improvements to pixmap cache key generation"Thiago Macieira2010-05-144-57/+50
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1445-653/+1055
| | |\ \ \ \ \ \
| | | * | | | | | More improvements to pixmap cache key generationJens Bache-Wiig2010-05-144-50/+57
| | | * | | | | | More 4.7 stuff.Trond Kjernåsen2010-05-141-0/+3
| | | * | | | | | Fix for autotest failure in qwidget::saveRestoreGeometry()Carlos Manuel Duclos Vergara2010-05-141-1/+1