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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
This commit is contained in:
Eike Ziller
2017-04-21 15:29:27 +02:00
parent ac86b2e8dd 1891af4b07
commit dae2556d2f
49 changed files with 191 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -185,37 +185,23 @@ PropertyInfo::PropertyInfo(uint flags)
QString PropertyInfo::toString() const
{
bool join = false;
QString res;
if (isReadable()) {
res += QLatin1String("Readable");
join = true;
}
if (isWriteable()) {
if (join)
res += QLatin1Char('|');
res += QLatin1String("Writeable");
join = true;
}
if (isList()) {
if (join)
res += QLatin1Char('|');
res += QLatin1String("ListType");
join = true;
}
if (canBePointer()) {
if (join)
res += QLatin1Char('|');
res += QLatin1String("Pointer");
join = true;
}
if (canBeValue()) {
if (join)
res += QLatin1Char('|');
res += QLatin1String("Value");
join = true;
}
return res;
QStringList list;
if (isReadable())
list.append("Readable");
if (isWriteable())
list.append("Writeable");
if (isList())
list.append("ListType");
if (canBePointer())
list.append("Pointer");
if (canBeValue())
list.append("Value");
return list.join('|');
}
} // namespace QmlJS