summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-03-011-1/+1
| | | |\ \ \ \
| | | * | | | | Fix position of image in detail view in flickr-mobileYann Bodson2010-03-011-4/+1
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-011-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-01426-3734/+26562
| | |\ \ \ \ \ \
| | * | | | | | | Make compile following QDeclarativePropertyChanges.Bea Lam2010-03-011-28/+28
| | * | | | | | | Fix reload() when keys are not specified, and add extra tests.Bea Lam2010-03-012-43/+108
| * | | | | | | | Keep image centered in ImageDetails.Martin Jones2010-03-011-3/+1
| * | | | | | | | Small optimizations.Martin Jones2010-03-012-4/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-03-0121-26/+33
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Fix compile warningAaron Kennedy2010-03-011-1/+1
| |/ / / / / /
| * | | | | | Use setOpacity(0.) rather than setVisible() to avoid positioner relayout.Martin Jones2010-03-011-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-0/+2
| |\ \ \ \ \
| | * | | | | Fix IM repaint.Warwick Allison2010-03-011-0/+2
| * | | | | | Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEventMartin Jones2010-03-016-12/+12
| * | | | | | Set correct transformOrigin.Martin Jones2010-03-011-0/+1
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-01290-2145/+16928
| |\ \ \ \ \
| | * | | | | Fixed private header include style to work when headers are installed.Rohan McGovern2010-03-018-9/+9
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-03-012-3/+7
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-281-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Don't use SSE2 if the emmintrin.h header wasn't found.Thiago Macieira2010-02-281-1/+1
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2844-169/+467
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2744-169/+467
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2744-169/+467
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2744-169/+467
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2644-169/+467
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-2644-169/+467
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2645-169/+467
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2545-169/+467
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | Rebuild configure.exeAndrew den Exter2010-02-251-0/+0
| | | | | | | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingAndrew den Exter2010-02-2528-71/+222
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * | | | | QT7; Fix warnings.Justin McPherson2010-02-251-31/+43
| | | | | | | | | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-stagingJustin McPherson2010-02-258-34/+87
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | Fixed QTMoview object leak.Dmytro Poplavskiy2010-02-252-2/+4
| | | | | | | | | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingDmytro Poplavskiy2010-02-253-0/+11
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-253-0/+11
| | | | | | | | | | * | | | | | Use the monitor color space for video output.Dmytro Poplavskiy2010-02-252-4/+34
| | | | | | | | | | * | | | | | Try to start media playback on all load state changes.Dmytro Poplavskiy2010-02-252-30/+40
| | | | | | | | | | |/ / / / /
| | | | | | | | | * | | | | | Qt namespace fixes.Justin McPherson2010-02-2519-6/+92
| | | | | | | | | |/ / / / /
| | | | | | | | * | | | | | Make the Direct Show media service compile with a Qt namespace.Andrew den Exter2010-02-251-2/+2
| | | | | | | | * | | | | | Make the Direct Show media service compile with mingw.Andrew den Exter2010-02-2510-45/+152
| | | | | | | | * | | | | | Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-252-2/+11
| | | | | | | | * | | | | | Remove all uses of __uuidof from the Direct Show media service.Andrew den Exter2010-02-2510-51/+59
| | | | | | | | |/ / / / /
| | | | | | | | * | | | | QT7; Add support for setting cookies when loading a movie.Justin McPherson2010-02-251-4/+27
* | | | | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-27104-677/+1772
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | * | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-26101-1087/+13878
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-265-6/+60
| | | |\ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2733-199/+517
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Autotest: no need to call exitLoop twice, from two threads.Thiago Macieira2010-02-271-3/+1