diff options
Diffstat (limited to 'src/qmldebug')
-rw-r--r-- | src/qmldebug/qqmlenginecontrolclient.cpp | 6 | ||||
-rw-r--r-- | src/qmldebug/qqmlprofilerclient.cpp | 4 | ||||
-rw-r--r-- | src/qmldebug/qqmlprofilerclient_p_p.h | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/qmldebug/qqmlenginecontrolclient.cpp b/src/qmldebug/qqmlenginecontrolclient.cpp index 13f216ce38..8d62fafb94 100644 --- a/src/qmldebug/qqmlenginecontrolclient.cpp +++ b/src/qmldebug/qqmlenginecontrolclient.cpp @@ -99,8 +99,8 @@ void QQmlEngineControlClient::messageReceived(const QByteArray &data) { Q_D(QQmlEngineControlClient); QPacket stream(d->connection->currentDataStreamVersion(), data); - int message; - int id; + qint32 message; + qint32 id; QString name; stream >> message >> id; @@ -151,7 +151,7 @@ void QQmlEngineControlClientPrivate::sendCommand( { Q_Q(QQmlEngineControlClient); QPacket stream(connection->currentDataStreamVersion()); - stream << int(command) << engineId; + stream << static_cast<qint32>(command) << engineId; q->sendMessage(stream.data()); } diff --git a/src/qmldebug/qqmlprofilerclient.cpp b/src/qmldebug/qqmlprofilerclient.cpp index d2a2d24f13..356190f2b0 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 0caef8e448..99fe47301b 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); @@ -112,4 +112,3 @@ public: QT_END_NAMESPACE #endif // QQMLPROFILERCLIENT_P_P_H - |