diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:16:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-06 11:16:18 +0000 |
| commit | 85c4904ec8d29ad8074bebef880ffe362ea3241e (patch) | |
| tree | b4b832881482f89cd2f7a2b05ece9d19162cb642 /src/quick/items/qquickitemsmodule.cpp | |
| parent | b049085a2c13abe9cf89308d02a90b9a0be6cde1 (diff) | |
| parent | a005dcb57eb2938032c3e4c983ea04472190455c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 7d905a23ef..01b8a249df 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -126,7 +126,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) QQuickItemPrivate::registerAccessorProperties(); #ifdef QT_NO_MOVIE - qmlRegisterTypeNotAvailable(uri,major,minor,"AnimatedImage", qApp->translate("QQuickAnimatedImage","Qt was built without support for QMovie")); + qmlRegisterTypeNotAvailable(uri,major,minor,"AnimatedImage", QCoreApplication::translate("QQuickAnimatedImage","Qt was built without support for QMovie")); #else qmlRegisterType<QQuickAnimatedImage>(uri,major,minor,"AnimatedImage"); #endif |