diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:03:27 +0100 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:05:09 +0100 |
| commit | a005dcb57eb2938032c3e4c983ea04472190455c (patch) | |
| tree | b6b064e257c4d76708e5a52fed3e1a80660790d3 /src/quick/items/qquickitemsmodule.cpp | |
| parent | e7c18e2a2b39f35667e76aaafa7135bde161a806 (diff) | |
| parent | af9e21cd91abcff9e084161cb7ed15fbedc8f931 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/quick/items/qquicktextedit.cpp
Change-Id: I354093ceb996aae40254f2143dec2bb74cf5eb17
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 94bfd9ba4e..f6e5838922 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 |