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

Compile after qt5/qtbase commit 75a0c7f9

Browse Source 
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Bradley T. Hughes
2012-04-30 12:01:15 +02:00
parent d681bc10c9
commit fb9146a9c3
49 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -548,7 +548,7 @@ public:
void assignSuffixes(const QStringList &patterns);
void debug(QTextStream &str, int indent = 0) const;
const QRegExp suffixPattern;
QRegExp suffixPattern;
QString type;
QString comment;
@@ -814,7 +814,8 @@ unsigned MimeType::matchesFileBySuffix(Internal::FileMatchContext &c) const
{
// check globs
foreach (const MimeGlobPattern &gp, m_d->globPatterns) {
if (gp.regExp().exactMatch(c.fileName()))
QRegExp regExp = gp.regExp();
if (regExp.exactMatch(c.fileName()))
return gp.weight();
}
return 0;