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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
This commit is contained in:
Eike Ziller
2014-01-15 14:04:41 +01:00
parent 8ab5b7ec0b 8d04b65ae9
commit 851f255b9d
39 changed files with 303 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerprotocol.cpp
View File

@@ -56,7 +56,7 @@ uchar fromhex(uchar c)
return 10 + c - 'a';
if (c >= 'A' && c <= 'Z')
return 10 + c - 'A';
return -1;
return UCHAR_MAX;
}
void skipCommas(const char *&from, const char *to)
@@ -147,7 +147,7 @@ QByteArray GdbMi::parseCString(const char *&from, const char *to)
uchar prod = 0;
while (true) {
uchar val = fromhex(c);
if (val == uchar(-1))
if (val == UCHAR_MAX)
break;
prod = prod * 16 + val;
if (++chars == 3 || src == end)