diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 19:31:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 19:34:54 +0200 |
| commit | cedca298f081e1c1cdac615eed6171fe687f35e2 (patch) | |
| tree | 97122bfaa975e09d5c8ff9f56739c13cda636ab3 /src | |
| parent | 15090ec53621211616c4136ab37e0332c3ae709a (diff) | |
| parent | 6c37300c667e3049178f049a5b86e7ea955c9671 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I58f3843f7dffd69b3924b652b8401ce5de2021ba
Diffstat (limited to 'src')
| -rw-r--r-- | src/enginio_plugin/enginioqmlclient_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/enginio_plugin/enginioqmlclient_p_p.h b/src/enginio_plugin/enginioqmlclient_p_p.h index e253205..a5ca531 100644 --- a/src/enginio_plugin/enginioqmlclient_p_p.h +++ b/src/enginio_plugin/enginioqmlclient_p_p.h @@ -57,7 +57,7 @@ public: static EnginioQmlClientPrivate* get(EnginioClientConnection *client) { return static_cast<EnginioQmlClientPrivate*>(EnginioClientConnectionPrivate::get(client)); } static EnginioQmlClient* get(EnginioClientConnectionPrivate *client) { return static_cast<EnginioQmlClient*>(client->q_ptr); } - virtual void init(); + virtual void init() Q_DECL_OVERRIDE; virtual void emitSessionTerminated() const Q_DECL_OVERRIDE; virtual void emitSessionAuthenticated(EnginioReplyState *reply) Q_DECL_OVERRIDE; virtual void emitSessionAuthenticationError(EnginioReplyState *reply) Q_DECL_OVERRIDE; |