diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-05 13:28:22 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-07 16:32:13 +0000 |
| commit | 4774ada6c0ab08cf1f0a775cb6e6b1cba8c6962d (patch) | |
| tree | 4a7041a9b485af2ec790af8abd06034b627249ad | |
| parent | 9fbb5d485f429da022c58948937105dd9206130e (diff) | |
Define ~QQmlProfilerClient out of line
This is a virtual function. We want only one definition of it. This also
fixes some linker warnings to the same effect.
Change-Id: Idffea96e705470be5d79bfd075fb62c0d52eac00
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qmldebug/qqmlprofilerclient.cpp | 4 | ||||
| -rw-r--r-- | src/qmldebug/qqmlprofilerclient_p_p.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/qmldebug/qqmlprofilerclient.cpp b/src/qmldebug/qqmlprofilerclient.cpp index dca564cd76..1eaa3e7667 100644 --- a/src/qmldebug/qqmlprofilerclient.cpp +++ b/src/qmldebug/qqmlprofilerclient.cpp @@ -43,6 +43,10 @@ QT_BEGIN_NAMESPACE +QQmlProfilerClientPrivate::~QQmlProfilerClientPrivate() +{ +} + int QQmlProfilerClientPrivate::resolveType(const QQmlProfilerTypedEvent &event) { int typeIndex = -1; diff --git a/src/qmldebug/qqmlprofilerclient_p_p.h b/src/qmldebug/qqmlprofilerclient_p_p.h index cf0145409a..b90793d733 100644 --- a/src/qmldebug/qqmlprofilerclient_p_p.h +++ b/src/qmldebug/qqmlprofilerclient_p_p.h @@ -79,7 +79,7 @@ public: { } - virtual ~QQmlProfilerClientPrivate() override {} + virtual ~QQmlProfilerClientPrivate() override; void sendRecordingStatus(int engineId); bool updateFeatures(ProfileFeature feature); @@ -110,4 +110,3 @@ public: QT_END_NAMESPACE #endif // QQMLPROFILERCLIENT_P_P_H - |