summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* modelviews/visualitemmodel example changesartoka2011-11-178-550/+6
* Modelviews Examples Modificationsartoka2011-11-1792-2625/+43
* modelviews/stringlistmodel example modificationsartoka2011-11-173-19/+43
* modelviews/pathview example modificationsartoka2011-11-1714-436/+6
* modelviews/parallax example modificationsartoka2011-11-1717-8/+214
* modelviews/package example modificationsartoka2011-11-1710-3/+209
* modelview/objectlistmodel example modificationsartoka2011-11-174-26/+44
* Modelview examples modifications.artoka2011-11-17151-3309/+43
* modelviews/gridview-example example modificationsartoka2011-11-1714-436/+6
* modelviews/delegate example modificationsartoka2011-11-178-437/+7
* modelviews/abstractitemmodel example modificationsartoka2011-11-173-10/+41
* keyintegration example modificationsartoka2011-11-1718-909/+8
* imageelements/borderimage, image and shadows example modificationsartoka2011-11-1745-1739/+18
* i18n example modificationsartoka2011-11-178-514/+6
* cppextensions/qgraphicslayouts examples modificationsartoka2011-11-178-29/+120
* cppextensions/networkaccessmanagerfactory modificationsartoka2011-11-175-24/+52
* animations/states example modificationsartoka2011-11-1711-667/+6
* animation/easing example modificationsartoka2011-11-1710-488/+6
* behaviors/behavior-example modificationsartoka2011-11-1713-740/+6
* Basics example cleanupartoka2011-11-173-231/+0
* basics/property-animation modificationsartoka2011-11-1713-546/+6
* Basics/color-animation modificationsartoka2011-11-1713-541/+8
* Centralized qmlapplicationviewer for declarative examples and demosartoka2011-11-173-0/+421
* Merge remote-tracking branch 'mainline/4.8'Casper van Donderen2011-11-17168-49263/+24199
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-171-2/+29
| |\
| | * QNAM: make systemProxyForQuery respect http_proxyArvid Ephraim Picciani2011-11-171-2/+29
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-168-16/+275
| |\ \
| | * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-16124-50916/+23481
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-166-4/+23
| |\ \ \ | | | |/ | | |/|
| | * | Add the ability to do unsafe SSL renegotiation as a fallback.Richard Moore2011-11-156-4/+23
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-1524-160/+187
| |\ \ \
| * \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-11-156-6/+65
| |\ \ \ \
| | * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-158-8/+92
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-11-151-0/+4
| | | |\ \ \ \
| | | | * | | | tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-11-151-1/+4
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Fix focusScopeItemChange setting crashDamian Jansen2011-11-151-1/+4
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-11-112-2/+27
| | | |\ \ \ \ \
| | | | * | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-112-2/+27
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-11-095-8/+57
| | | |\ \ \ \ \ \
| | | | * | | | | | symbian - handle path being passed as part of filename in QTranslatorShane Kearns2011-11-074-5/+54
| | | | * | | | | | Symbian - fix compile error when default configuredShane Kearns2011-11-071-3/+3
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-11-082-0/+5
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Compile when -no-rtti is specified as a configure optionAndy Shaw2011-11-071-0/+4
| | | | * | | | | | Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2011-11-071-0/+1
| | | |/ / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-153-16/+126
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-153-16/+126
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-153-28/+102
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-152-1/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-142-0/+40
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |