feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Fix compile with Qt5.6

Browse Source 
Change-Id: I4394530321db3a2081d49b4e243b37c1840c2227
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Christian Stenger
2016-07-20 10:49:36 +02:00
parent 7ed7ecd4a5
commit 97a465ae18
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
View File

@@ -233,11 +233,11 @@ void QmlProfilerClientManager::connectClientSignals()
QTC_ASSERT(m_profilerState, return); QTC_ASSERT(m_profilerState, return);
QObject::connect(m_qmlclientplugin.data(), &QmlProfilerTraceClient::recordingChanged, QObject::connect(m_qmlclientplugin.data(), &QmlProfilerTraceClient::recordingChanged,
m_profilerState, &QmlProfilerStateManager::setServerRecording); m_profilerState.data(), &QmlProfilerStateManager::setServerRecording);
QObject::connect(m_profilerState, &QmlProfilerStateManager::requestedFeaturesChanged, QObject::connect(m_profilerState.data(), &QmlProfilerStateManager::requestedFeaturesChanged,
m_qmlclientplugin.data(), &QmlProfilerTraceClient::setRequestedFeatures); m_qmlclientplugin.data(), &QmlProfilerTraceClient::setRequestedFeatures);
QObject::connect(m_qmlclientplugin.data(), &QmlProfilerTraceClient::recordedFeaturesChanged, QObject::connect(m_qmlclientplugin.data(), &QmlProfilerTraceClient::recordedFeaturesChanged,
m_profilerState, &QmlProfilerStateManager::setRecordedFeatures); m_profilerState.data(), &QmlProfilerStateManager::setRecordedFeatures);
} }
void QmlProfilerClientManager::disconnectClientSignals() void QmlProfilerClientManager::disconnectClientSignals()
@@ -249,7 +249,7 @@ void QmlProfilerClientManager::disconnectClientSignals()
m_qmlclientplugin->disconnect(); m_qmlclientplugin->disconnect();
QTC_ASSERT(m_profilerState, return); QTC_ASSERT(m_profilerState, return);
QObject::disconnect(m_profilerState, &QmlProfilerStateManager::requestedFeaturesChanged, QObject::disconnect(m_profilerState.data(), &QmlProfilerStateManager::requestedFeaturesChanged,
m_qmlclientplugin.data(), &QmlProfilerTraceClient::setRequestedFeatures); m_qmlclientplugin.data(), &QmlProfilerTraceClient::setRequestedFeatures);
} }
@@ -333,9 +333,9 @@ void QmlProfilerClientManager::setProfilerStateManager(QmlProfilerStateManager *
QTC_ASSERT(m_connection.isNull() && m_qmlclientplugin.isNull(), disconnectClient()); QTC_ASSERT(m_connection.isNull() && m_qmlclientplugin.isNull(), disconnectClient());
if (m_profilerState) { if (m_profilerState) {
disconnect(m_profilerState, &QmlProfilerStateManager::stateChanged, disconnect(m_profilerState.data(), &QmlProfilerStateManager::stateChanged,
this, &QmlProfilerClientManager::profilerStateChanged); this, &QmlProfilerClientManager::profilerStateChanged);
disconnect(m_profilerState, &QmlProfilerStateManager::clientRecordingChanged, disconnect(m_profilerState.data(), &QmlProfilerStateManager::clientRecordingChanged,
this, &QmlProfilerClientManager::clientRecordingChanged); this, &QmlProfilerClientManager::clientRecordingChanged);
} }
@@ -343,9 +343,9 @@ void QmlProfilerClientManager::setProfilerStateManager(QmlProfilerStateManager *
// connect // connect
if (m_profilerState) { if (m_profilerState) {
connect(m_profilerState, &QmlProfilerStateManager::stateChanged, connect(m_profilerState.data(), &QmlProfilerStateManager::stateChanged,
this, &QmlProfilerClientManager::profilerStateChanged); this, &QmlProfilerClientManager::profilerStateChanged);
connect(m_profilerState, &QmlProfilerStateManager::clientRecordingChanged, connect(m_profilerState.data(), &QmlProfilerStateManager::clientRecordingChanged,
this, &QmlProfilerClientManager::clientRecordingChanged); this, &QmlProfilerClientManager::clientRecordingChanged);
} }
} }