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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
This commit is contained in:
con
2010-06-18 16:54:37 +02:00
parent 443d5d3dc6 13bb14dd3c
commit 458a25efa9
36 changed files with 430 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljseditor/qmljscodecompletion.cpp
View File

@@ -79,7 +79,7 @@ enum CompletionRelevance {
};
// Temporary workaround until we have proper icons for QML completion items
QIcon iconForColor(const QColor &color)
static QIcon iconForColor(const QColor &color)
{
QPixmap pix(6, 6);
@@ -109,7 +109,7 @@ QIcon iconForColor(const QColor &color)
return pix;
}
bool checkStartOfIdentifier(const QString &word)
static bool checkStartOfIdentifier(const QString &word)
{
if (word.isEmpty())
return false;
@@ -125,7 +125,7 @@ bool checkStartOfIdentifier(const QString &word)
}
}
bool isIdentifierChar(QChar ch)
static bool isIdentifierChar(QChar ch)
{
switch (ch.unicode()) {
case '_': case '$':