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/watchdata.h
View File

@@ -44,7 +44,7 @@ class WatchItem : public Utils::TreeItem
public:
WatchItem();
void parse(const GdbMi &input);
void parse(const GdbMi &input, bool maySort);
bool isLocal() const;
bool isWatcher() const;
@@ -116,13 +116,14 @@ public:
uint bitsize; // Size in case of bit fields
int elided; // Full size if value was cut off, -1 if cut on unknown size, 0 otherwise
int arrayIndex; // -1 if not an array member
uchar sortGroup; // 0 - ordinary member, 1 - vptr, 2 - base class
bool wantsChildren;
bool valueEnabled; // Value will be enabled or not
bool valueEditable; // Value will be editable
bool outdated; // \internal item is to be removed.
private:
void parseHelper(const GdbMi &input);
void parseHelper(const GdbMi &input, bool maySort);
Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchHandler)
};