summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-012-3/+4
|\
| * Fix building with Sun CC 5.10: missing :: for the QWeakPointer declarationThiago Macieira2010-03-011-2/+2
| * compile fix for WinCEMaurice Kalinowski2010-03-011-1/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-2/+19
|\ \
| * \ 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-01203-2053/+4146
| |\ \ \
| * | | | Fix reload() when keys are not specified, and add extra tests.Bea Lam2010-03-011-2/+19
* | | | | Small optimizations.Martin Jones2010-03-012-4/+10
| |_|/ / |/| | |
* | | | 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
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-01137-1023/+2053
|\ \ \
| * | | 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-011-0/+6
| |\ \ \ | | |_|/ | |/| |
| * | | 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-2742-168/+456
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2742-168/+456
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2742-168/+456
| | | |\ \ \
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2642-168/+456
| | | | |\ \ \
| | | | | * \ \ Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-2642-168/+456
| | | | | |\ \ \
| | | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2642-168/+456
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2542-168/+456
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingAndrew den Exter2010-02-2527-71/+221
| | | | | | | | |\ \ \
| | | | | | | | | * | | 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-257-34/+86
| | | | | | | | | |\ \ \
| | | | | | | | | | * | | 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-252-0/+10
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * | | QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-252-0/+10
| | | | | | | | | | * | | | 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-251-1/+1
| | | | | | | | * | | | 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 remote branch 'origin/master' into 4.7Thiago Macieira2010-02-27420-22087/+25245
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-273-4/+285
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-273-4/+285
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | QMainWindow would show hidden QDockwidget when calling rstoreDockWidgetThierry Bastian2010-02-261-2/+1
| | | | * | | | | | | Compile on WinCEaavit2010-02-252-2/+284
| | | | | |_|/ / / / | | | | |/| | | | |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2610-22/+44
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-26449-22277/+25381
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | use QList::reserve() as appropriateOswald Buddenhagen2010-02-252-0/+6
| | | * | | | | | | optimize appending of (empty) lists to (empty) listsOswald Buddenhagen2010-02-251-9/+16
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-248-13/+22
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | suppress pointer aliasing warningsOswald Buddenhagen2010-02-241-3/+6
| | | | * | | | | | Fix compilation with namespace.ck2010-02-241-0/+1
| | | | * | | | | | Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-246-10/+15