aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/filenamevalidatinglineedit.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-04-30 12:01:15 +0200
committerBradley T. Hughes <bradley.hughes@nokia.com>2012-04-30 14:32:08 +0200
commitfb9146a9c39b70f84b78c7b75ba7503214fd4296 (patch)
treef443c543127146c16553ee4aa300d73a0d81bfd7 /src/libs/utils/filenamevalidatinglineedit.cpp
parentd681bc10c9977036e02d84c9e3023bd86050abee (diff)
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/libs/utils/filenamevalidatinglineedit.cpp')
-rw-r--r--src/libs/utils/filenamevalidatinglineedit.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp
index a90356e1908..04d7a637727 100644
--- a/src/libs/utils/filenamevalidatinglineedit.cpp
+++ b/src/libs/utils/filenamevalidatinglineedit.cpp
@@ -50,17 +50,16 @@ namespace Utils {
// Naming a file like a device name will break on Windows, even if it is
// "com1.txt". Since we are cross-platform, we generally disallow such file
// names.
-static const QRegExp &windowsDeviceNoSubDirPattern()
+static QRegExp &windowsDeviceNoSubDirPattern()
{
- static const QRegExp rc(QLatin1String(WINDOWS_DEVICES),
- Qt::CaseInsensitive);
+ static QRegExp rc(QLatin1String(WINDOWS_DEVICES), Qt::CaseInsensitive);
QTC_ASSERT(rc.isValid(), return rc);
return rc;
}
-static const QRegExp &windowsDeviceSubDirPattern()
+static QRegExp &windowsDeviceSubDirPattern()
{
- static const QRegExp rc(QLatin1String(".*[/\\\\](" WINDOWS_DEVICES ")"), Qt::CaseInsensitive);
+ static QRegExp rc(QLatin1String(".*[/\\\\](" WINDOWS_DEVICES ")"), Qt::CaseInsensitive);
QTC_ASSERT(rc.isValid(), return rc);
return rc;
}