diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 08:18:13 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 12:49:44 +0200 |
| commit | 2329a3145e59c16b5bbc37cedad7e67e16f14fb8 (patch) | |
| tree | 73900588daab4c2c91ef0ff6566818905375ca85 /src/qml/qml/qqmlengine.h | |
| parent | d0eb6f9e07156880c6d9de4b98b2e4abfc4a0bfb (diff) | |
| parent | 432e27ae092397cb2154f48103e729852c38cf2d (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I0af7b0c3e0a21aae68c82ec11c5ca579c1661ce9
Diffstat (limited to 'src/qml/qml/qqmlengine.h')
| -rw-r--r-- | src/qml/qml/qqmlengine.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 8cada954fe..2bf4c0497b 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -144,6 +144,10 @@ public: bool outputWarningsToStandardError() const; void setOutputWarningsToStandardError(bool); +public Q_SLOTS: + void retranslate(); + +public: static QQmlContext *contextForObject(const QObject *); static void setContextForObject(QObject *, QQmlContext *); |