summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Use QList::reserve() in QDataStream>>QListAndreas Kling2010-03-011-0/+1
| | | | Reviewed-by: Denis Dzyubenko
* Added static method isValidColor to QColor.Erik Verbruggen2010-03-012-3/+28
| | | | Reviewed-by: Gunnar Sletta
* compile fix with namespaceshjk2010-03-011-1/+2
|
* qDetectCPUFeatures: compile fix with namespaceshjk2010-03-011-2/+1
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-011-3/+17
|\
| * Mac: using Qt to write plugins disables quit for 3rd party applicationRichard Moe Gustavsen2010-03-011-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that qt_init always installs/overwrites apple event handlers. So if the 3rd party app had already installed an event handler for kAEQuit, then it will be removed when the Qt plugin is loaded. This patch checks (in the carbon case) if event handlers already exists before installing new ones, or, in the cocoa case, avoids installing apple event handlers if the AA_MacPluginApplication is set. In other words, handling quit etc is seen as the responsibility of the app, and not the plugin. Task-number: QTBUG-8087 Reviewed-by: prasanth
* | compile fix for WinCEMaurice Kalinowski2010-03-011-0/+2
|/ | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-012-3/+4
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix building with Sun CC 5.10: missing :: for the QWeakPointer declaration compile fix for WinCE
| * 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
| | | | | | | | | | | | need to add the win32 file to get copy and friends included Reviewed-by: Simon Hausmann
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-2/+19
|\ \ | | | | | | | | | | | | Conflicts: demos/declarative/flickr/mobile/ImageDetails.qml
| * \ 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
| * | | | 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
| | | | | | | | | | | | | | | | Task-number: QT-448
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private headers should include other private headers by: #include <private/qfoo_p.h> Using a relative path works during the build, but does not work when building other projects which attempt to use the installed private headers (e.g. unit tests for private classes).
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-03-011-0/+6
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Add mention of highlightRangeMode in snapMode docs. Fix position of image in detail view.
| * | | Don't use SSE2 if the emmintrin.h header wasn't found.Thiago Macieira2010-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If you build on Solaris, the header isn't available, but SSE2 instructions are available on x86-64. So either we use inline assembly, or we disable the new code.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2742-168/+456
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2742-168/+456
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2742-168/+456
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2642-168/+456
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | | | | * \ \ Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-2642-168/+456
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2642-168/+456
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | | | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2542-168/+456
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| | | | | | | | * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | | | | | | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
| | | | | | | | | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | | | | | | | | | * | | | Use the monitor color space for video output.Dmytro Poplavskiy2010-02-252-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the main monitor color space is used. Colorspace correction is disabled by default for renderer video output, since video frames can on any output device, not only on the main monitor. Reviewed-by: Justin McPherson
| | | | | | | | | | * | | | Try to start media playback on all load state changes.Dmytro Poplavskiy2010-02-252-30/+40
| | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QuickTime doesn't start movie playback as soon as it loaded, it's necessary to start manualy after suitable load state reached. Reviewed-by: Justin McPherson
| | | | | | | | | * | | | Qt namespace fixes.Justin McPherson2010-02-2519-6/+92
| | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | | | | | | * | | | Make the Direct Show media service compile with a Qt namespace.Andrew den Exter2010-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move a QFile include outside the namespace. Reviewed-by: Justin McPherson
| | | | | | | | * | | | Make the Direct Show media service compile with mingw.Andrew den Exter2010-02-2510-45/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There a number of interfaces and guid constants used by the media service that aren't defined by mingw. Define these locally. Reviewed-by: Justin McPherson
| | | | | | | | * | | | Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some filters use interfaces from the windows media sdk instead of those from direct show. These interfaces aren't required for playback, but can provide better feedback about the current media than would otherwise be available. Reviewed-by: Justin McPherson
| | | | | | | | * | | | Remove all uses of __uuidof from the Direct Show media service.Andrew den Exter2010-02-2510-51/+59
| | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unnecessary and not supported on all compilers. Reviewed-by: Justin McPherson
| | | | | | | | * | | QT7; Add support for setting cookies when loading a movie.Justin McPherson2010-02-251-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * | | | | | | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-27420-22087/+25245
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-273-4/+285
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMainWindow would show hidden QDockwidget when calling rstoreDockWidget Compile on WinCE
| | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-273-4/+285
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMainWindow would show hidden QDockwidget when calling rstoreDockWidget Compile on WinCE
| | | | * | | | | | | QMainWindow would show hidden QDockwidget when calling rstoreDockWidgetThierry Bastian2010-02-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7785 Reviewed-by: ogoffart
| | | | * | | | | | | Compile on WinCEaavit2010-02-252-2/+284
| | | | | |_|/ / / / | | | | |/| | | | |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-2610-22/+44
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) fix "configure -fast" on Windows for other maketools than nmake Get qmake to add pdb files to install target in debug configuration. add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX give symbian an own platform mode deprecate -win32/-unix/-macx which set both host and target mode decouple host platform mode from target platform mode factor out applyHostMode() make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins use QDir::separator() instead of Option::dir_sep where appropriate simplify string ops sanitize evaluation of OS scopes instead of hard-coding recursion for symbian, add it to the specs add possibility to request project recursion from within a pro file fix ts-assistant target use QList::reserve() as appropriate optimize appending of (empty) lists to (empty) lists suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). ...