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

GLSLEditor: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: I88114509d972c498c3891c45d5e1f9b7fc9d3f3f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-26 20:58:49 +02:00
committed by Friedemann Kleint
parent 9be874ba25
commit 2ea3b2343d
5 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/glsleditor/glslcompletionassist.cpp
View File

@@ -201,15 +201,15 @@ int GLSLFunctionHintProposalModel::activeArgument(const QString &prefix) const
// -----------------------------
GLSLCompletionAssistProcessor::GLSLCompletionAssistProcessor()
: m_startPosition(0)
, m_keywordIcon(":/glsleditor/images/keyword.png")
, m_varIcon(":/glsleditor/images/var.png")
, m_functionIcon(":/glsleditor/images/func.png")
, m_typeIcon(":/glsleditor/images/type.png")
, m_constIcon(":/glsleditor/images/const.png")
, m_attributeIcon(":/glsleditor/images/attribute.png")
, m_uniformIcon(":/glsleditor/images/uniform.png")
, m_varyingIcon(":/glsleditor/images/varying.png")
, m_otherIcon(":/glsleditor/images/other.png")
, m_keywordIcon(QLatin1String(":/glsleditor/images/keyword.png"))
, m_varIcon(QLatin1String(":/glsleditor/images/var.png"))
, m_functionIcon(QLatin1String(":/glsleditor/images/func.png"))
, m_typeIcon(QLatin1String(":/glsleditor/images/type.png"))
, m_constIcon(QLatin1String(":/glsleditor/images/const.png"))
, m_attributeIcon(QLatin1String(":/glsleditor/images/attribute.png"))
, m_uniformIcon(QLatin1String(":/glsleditor/images/uniform.png"))
, m_varyingIcon(QLatin1String(":/glsleditor/images/varying.png"))
, m_otherIcon(QLatin1String(":/glsleditor/images/other.png"))
{}
GLSLCompletionAssistProcessor::~GLSLCompletionAssistProcessor()