diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-12-07 08:11:24 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-12-07 07:49:26 +0000 |
| commit | 5a10f12751d64d1c75e006d39c9ca82e3063d8fd (patch) | |
| tree | 017acfab5e701b2e499542d50203cdc2cb6659c1 /src | |
| parent | eb574d77b0ab9a92b61e7738d089cd4ea4304e51 (diff) | |
Fix target directory check for reserved words on Windows
If the directory starts with "Con" etc then it is still ok to use, it is
only if it is /Con or /Con/ that it is not allowed. So the extra check to
be sure has anything after the reserved part is included.
Change-Id: I72e0e0f98167f29da54cb627e75cd1814c3f9706
Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagergui.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 3904d9fd6..2bbedb396 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -2385,7 +2385,7 @@ QString TargetDirectoryPage::targetDirWarning() const return tr("The installation path must not end with '.', please specify a valid folder."); QString ambiguousChars = QLatin1String("[\"~<>|?*!@#$%^&:,; ]" - "|(\\\\CON)|(\\\\PRN)|(\\\\AUX)|(\\\\NUL)|(\\\\COM\\d)|(\\\\LPT\\d)"); + "|(\\\\CON)(\\\\|$)|(\\\\PRN)(\\\\|$)|(\\\\AUX)(\\\\|$)|(\\\\NUL)(\\\\|$)|(\\\\COM\\d)(\\\\|$)|(\\\\LPT\\d)(\\\\|$)"); #else // Q_OS_WIN QString ambiguousChars = QStringLiteral("[~<>|?*!@#$%^&:,; \\\\]"); #endif // Q_OS_WIN |