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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
This commit is contained in:
Eike Ziller
2016-04-12 10:43:10 +02:00
parent 04acb9d643 8dadafb9e0
commit 5c87432260
341 changed files with 2512 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/watchhandler.h
View File

@@ -108,7 +108,9 @@ public:
void setCurrentItem(const QByteArray &iname);
void updateWatchersWindow();
void insertItem(WatchItem *item); // Takes ownership.
bool insertItem(WatchItem *item); // Takes ownership, returns whether item was added, not overwritten.
void insertItems(const GdbMi &data);
void removeItemByIName(const QByteArray &iname);
void removeAllData(bool includeInspectData = false);
void resetValueCache();
@@ -118,6 +120,7 @@ public:
void notifyUpdateFinished();
void reexpandItems();
void recordTypeInfo(const GdbMi &typeInfo);
private:
WatchModel *m_model; // Owned.