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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
This commit is contained in:
Eike Ziller
2015-09-01 12:57:51 +02:00
parent fb73a87033 a80f4d179b
commit 3b1a966cc8
62 changed files with 2582 additions and 2354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/qml/qmlinspectoragent.h
View File

@@ -32,6 +32,7 @@
#define QMLINSPECTORAGENT_H
#include <QStack>
#include <QPointer>
#include <QTimer>
#include <coreplugin/icontext.h>
@@ -127,7 +128,7 @@ private:
void enableTools(const bool enable);
private:
QmlEngine *m_qmlEngine;
QPointer<QmlEngine> m_qmlEngine;
QmlDebug::BaseEngineDebugClient *m_engineClient;
quint32 m_engineQueryId;