diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 16:12:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 16:12:03 (GMT) |
| commit | 9af7a61ff462ed1668838be949dac376adfb2c6c (patch) | |
| tree | 437e1a5125a6cfdf9b161fdff3b1d20cb3e4e59a /src | |
| parent | f710dfded9da517e6451809f81a8cc12ac4f3883 (diff) | |
| parent | 8bc0dce2c74c28acd36daa73e84f7c9d79760e4a (diff) | |
| download | Qt-9af7a61ff462ed1668838be949dac376adfb2c6c.zip Qt-9af7a61ff462ed1668838be949dac376adfb2c6c.tar.gz Qt-9af7a61ff462ed1668838be949dac376adfb2c6c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QString usage cleanups
Add some more changes for 4.7.0
Doc: removing bug breaking the article into pages. These pages was not linked anywhere.
QDeclarative: Fix spelling mistake.
Wrap translatable messages with tr() in assistant, designer and linguist
Enable loading/generating translations by assistant and linguist tools
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/mediaobject.cpp | 6 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/gstreamer/mediaobject.cpp b/src/3rdparty/phonon/gstreamer/mediaobject.cpp index 3e0addc..23a60c0 100644 --- a/src/3rdparty/phonon/gstreamer/mediaobject.cpp +++ b/src/3rdparty/phonon/gstreamer/mediaobject.cpp @@ -219,9 +219,9 @@ void MediaObject::noMorePadsAvailable () if ( status != GST_INSTALL_PLUGINS_STARTED_OK ) { if( status == GST_INSTALL_PLUGINS_HELPER_MISSING ) - setError(QString(tr("Missing codec helper script assistant.")), Phonon::FatalError ); + setError(tr("Missing codec helper script assistant."), Phonon::FatalError ); else - setError(QString(tr("Plugin codec installation failed for codec: %0")) + setError(tr("Plugin codec installation failed for codec: %0") .arg(m_missingCodecs[0].split("|")[3]), error); } m_missingCodecs.clear(); @@ -232,7 +232,7 @@ void MediaObject::noMorePadsAvailable () m_hasVideo = false; emit hasVideoChanged(false); } - setError(QString(tr("A required codec is missing. You need to install the following codec(s) to play this content: %0")).arg(codecs), error); + setError(tr("A required codec is missing. You need to install the following codec(s) to play this content: %0").arg(codecs), error); m_missingCodecs.clear(); #endif } diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 267642d..3c09747 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -332,7 +332,7 @@ void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool f) stopped - either by setting the \c running property to false, or by calling the \c stop() method. - In the following example, the rectangle will spin indefinately. + In the following example, the rectangle will spin indefinitely. \code Rectangle { |