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/help/helpplugin.cpp | |
| 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/help/helpplugin.cpp')
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 0ef8f145d9..509d08d246 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -514,7 +514,7 @@ void HelpPlugin::resetFilter() { const QString &filterInternal = QString::fromLatin1("Qt Creator %1.%2.%3") .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE); - const QRegExp filterRegExp(QLatin1String("Qt Creator \\d*\\.\\d*\\.\\d*")); + QRegExp filterRegExp(QLatin1String("Qt Creator \\d*\\.\\d*\\.\\d*")); QHelpEngineCore *engine = &LocalHelpManager::helpEngine(); const QStringList &filters = engine->customFilters(); @@ -900,7 +900,7 @@ void HelpPlugin::activateContext() "available.</center></body></html>").arg(m_idFromContext)); } else { int version = 0; - const QRegExp exp("(\\d+)"); + QRegExp exp("(\\d+)"); QUrl source = *links.begin(); const QLatin1String qtRefDoc = QLatin1String("com.trolltech.qt"); |