diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 16:22:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 16:22:48 (GMT) |
| commit | e0a9d73ccc2fea135316bca8afb2fadbc0466a56 (patch) | |
| tree | c27f62be20d87e83dd568d99a77990972eba0ece /src/multimedia/base/qmediaresource.cpp | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| parent | 2de691f9505cba2fd20b91d7cc7ea7e90bac71a0 (diff) | |
| download | Qt-e0a9d73ccc2fea135316bca8afb2fadbc0466a56.zip Qt-e0a9d73ccc2fea135316bca8afb2fadbc0466a56.tar.gz Qt-e0a9d73ccc2fea135316bca8afb2fadbc0466a56.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update of the QScriptValue autotest suite.
New autotests cases for QScriptValue autotests generator.
QScriptValue autotest generator templates change.
Fix license template.
QScriptValue::isQMetaObject crash fix.
Implement toLatin1_helper with SSE2
Doc: add \since 4.7 to new QtMultimedia classes
Autotest: add a test to ensure that the Qt headers are clean.
Compile on Linux: close(2) is defined in #include <unistd.h>
Improved gesture event delivery in graphicsview.
Fixed a gesture autotest.
Cache scene coordinates of a hotspot in a QGesture.
Add an extra operator delete() to QSharedPointer's internals.
Fix compilation on x86 with gcc if SSE2 is not enabled
Comments the SSE implementation of fromLatin1_helper()
Build fixes for the SIMD functions
Implement QString::fromLatin1_helper() with SSE2
Cache the result of qDetectCPUFeatures()
Move the SIMD detection from QtGui to QtCore
Prevent stale QWidget pointers in QCocoaView
Diffstat (limited to 'src/multimedia/base/qmediaresource.cpp')
| -rw-r--r-- | src/multimedia/base/qmediaresource.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/base/qmediaresource.cpp b/src/multimedia/base/qmediaresource.cpp index 515e432..646d9a7 100644 --- a/src/multimedia/base/qmediaresource.cpp +++ b/src/multimedia/base/qmediaresource.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE /*! \class QMediaResource \preliminary + \since 4.7 \brief The QMediaResource class provides a description of a media resource. \ingroup multimedia |