From fb9146a9c39b70f84b78c7b75ba7503214fd4296 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 30 Apr 2012 12:01:15 +0200 Subject: 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 Reviewed-by: Thiago Macieira Reviewed-by: Daniel Teske --- src/libs/utils/filenamevalidatinglineedit.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libs/utils/filenamevalidatinglineedit.cpp') diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp index a90356e190..04d7a63772 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; } -- cgit v1.2.1