diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-04-30 12:01:15 +0200 |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-04-30 14:32:08 +0200 |
| commit | fb9146a9c39b70f84b78c7b75ba7503214fd4296 (patch) | |
| tree | f443c543127146c16553ee4aa300d73a0d81bfd7 /src/plugins/genericprojectmanager | |
| parent | d681bc10c9977036e02d84c9e3023bd86050abee (diff) | |
| download | qt-creator-fb9146a9c39b70f84b78c7b75ba7503214fd4296.tar.gz | |
Compile after qt5/qtbase commit 75a0c7f9
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>
Diffstat (limited to 'src/plugins/genericprojectmanager')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/genericprojectmanager/selectablefilesmodel.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 06dfaa30c8..045d7c384c 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -307,7 +307,7 @@ void GenericProject::refresh(RefreshOptions options) */ static void expandEnvironmentVariables(const QProcessEnvironment &env, QString &string) { - const static QRegExp candidate(QLatin1String("\\$\\$\\((.+)\\)")); + static QRegExp candidate(QLatin1String("\\$\\$\\((.+)\\)")); int index = candidate.indexIn(string); while (index != -1) { diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.h b/src/plugins/genericprojectmanager/selectablefilesmodel.h index b25989700c..663346177f 100644 --- a/src/plugins/genericprojectmanager/selectablefilesmodel.h +++ b/src/plugins/genericprojectmanager/selectablefilesmodel.h @@ -64,7 +64,7 @@ struct Glob enum Mode { EXACT, ENDSWITH, REGEXP }; Mode mode; QString matchString; - QRegExp matchRegexp; + mutable QRegExp matchRegexp; }; class SelectableFilesModel : public QAbstractItemModel |