summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-247-5/+79
| | |\ \ \ \ \ \ \
| | | * | | | | | | Prevent value source animations from being registered to start twice.Michael Brasser2010-06-243-0/+47
| | | * | | | | | | Make compile.Michael Brasser2010-06-241-1/+1
| | | * | | | | | | More script benchmarking.Michael Brasser2010-06-243-4/+31
| | * | | | | | | | Update tests following QDeclarativeFlickable::viewport() -> contentIem()Martin Jones2010-06-243-214/+214
| | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2424-53/+291
| | |\ \ \ \ \ \ \
| | | * | | | | | | Script benchmarking.Michael Brasser2010-06-244-4/+157
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2445-154/+527
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Update lupdate to recognize concatenated text in QML files.Michael Brasser2010-06-241-16/+56
| | * | | | | | | | | Expose the Flickable's internal contentItemMartin Jones2010-06-247-41/+70
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Ensure sourcesize is in pixmap cache key.Warwick Allison2010-06-241-0/+6
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-243-0/+36
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | doc: note that calling methods before component completion may have no effectMartin Jones2010-06-233-0/+36
| | * | | | | | | | | Use ugly but reliable bitmaps fonts in test.Warwick Allison2010-06-2420-0/+2
| | |/ / / / / / / /
| | * | | | | | | | Fix unstable qdeclarativeviewer testsBea Lam2010-06-231-2/+2
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2342-138/+427
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-232-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Use Pen with Qt::MiterJoin when drawing Rectangles with gradientsBea Lam2010-06-231-0/+1
| | | | * | | | | | | | Update screenshotBea Lam2010-06-231-0/+0
| | | * | | | | | | | | Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-2327-56/+326
| | | |/ / / / / / / /
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-232-12/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Support for non-literal plural arguments to qsTr() in lupdate (QML).Michael Brasser2010-06-231-12/+4
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-236-25/+31
| | | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | | Ensure the view is correctly positioned at component complete.Martin Jones2010-06-236-45/+65
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | References to undefined variables throws a ReferenceErrorAaron Kennedy2010-06-236-25/+31
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-291-22/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | When application calls QNetworkSession::close() or QNetworkSession::stop(), m...Jukka Rissanen2010-06-291-22/+33
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2825-141/+365
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Enable SSE2 for MSVC x64 builds, as it was incorrectly disabledJohn Brooks2010-06-282-5/+4
| * | | | | | | | | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-285-5/+56
| * | | | | | | | | | | ignore *.vcxproj.userOswald Buddenhagen2010-06-281-0/+1
| * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-2818-126/+258
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Don't load ciphers and system certificates for QSslSocket::supportsSsl()Andreas Kling2010-06-283-12/+50
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-28100-1114/+2810
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-25921-23048/+12696
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-23290-8113/+3695
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| | * | | | | | | | | | | | | | Doc: Fixed links in the QML documentation.David Boddie2010-06-182-15/+15
| | * | | | | | | | | | | | | | Doc: Changed links to explicitly refer to QML objects.David Boddie2010-06-181-11/+11
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ...David Boddie2010-06-18115-649/+2071
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
| * | | | | | | | | | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2837-257/+402
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix build with def files on armSimon Hausmann2010-06-281-0/+2
| * | | | | | | | | | | | | | | | Build fix for src/plugins/phonon/mmfGareth Stockwell2010-06-281-93/+121
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2736-161/+276
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Make symbian/unix shadow builds work again.Thomas Zander2010-06-251-1/+1
| | * | | | | | | | | | | | | | | Change the files to camelcase as avkon now does thatThomas Zander2010-06-258-7/+15
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2527-153/+260
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Update EABI and WINSCW DEF files for SymbianIain2010-06-255-0/+18