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

Merge branch '2.3'

Browse Source 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
This commit is contained in:
Oswald Buddenhagen
2011-07-29 17:57:59 +02:00
parent 242b4280f9 7aaab4d050
commit 65c0eb5165
135 changed files with 7595 additions and 4403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/mimedatabase.cpp
View File

@@ -567,7 +567,7 @@ MimeTypeData::MimeTypeData()
// "*.log[1-9]"
: suffixPattern(QLatin1String("^\\*\\.[\\w+]+$"))
{
QTC_ASSERT(suffixPattern.isValid(), /**/);
QTC_CHECK(suffixPattern.isValid());
}
void MimeTypeData::clear()