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

Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-13 14:20:45 +01:00
parent 2776346db4
commit 80d3f73319
56 changed files with 468 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/profilehoverhandler.cpp
View File

@@ -125,7 +125,7 @@ void ProFileHoverHandler::identifyQMakeKeyword(const QString &text, int pos)
if (i >= pos)
break; // we are after the tooltip pos
}
if (c == '#')
if (c == QLatin1Char('#'))
break; // comment start
}
}
@@ -164,7 +164,7 @@ void ProFileHoverHandler::identifyDocFragment(ProFileHoverHandler::ManualKind ma
// Document fragment of qmake function is retrieved from docs.
// E.g. in case of the keyword "find" the document fragment
// parsed from docs is "find-variablename-substr".
m_docFragment = htmlExtractor.getQMakeFunctionId(html, m_docFragment);
m_docFragment = htmlExtractor.getQMakeFunctionId(QString::fromUtf8(html), m_docFragment);
}
}