mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-15 22:49:48 +00:00
Merge branch '2019noscope' into 'master'
Avoid an apparent compiler error in MSVC 2019 See merge request OpenMW/openmw!4451
This commit is contained in:
commit
2c51bde18b
@ -285,12 +285,12 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
|
||||
for (const QString& listName : getContentLists())
|
||||
{
|
||||
const auto& listDirs = getDataDirectoryList(listName);
|
||||
#ifdef Q_OS_WINDOWS
|
||||
constexpr auto caseSensitivity = Qt::CaseInsensitive;
|
||||
#else
|
||||
constexpr auto caseSensitivity = Qt::CaseSensitive;
|
||||
#endif
|
||||
constexpr auto compareDataDirectories = [](const SettingValue& dir, const QString& listDir) {
|
||||
#ifdef Q_OS_WINDOWS
|
||||
constexpr auto caseSensitivity = Qt::CaseInsensitive;
|
||||
#else
|
||||
constexpr auto caseSensitivity = Qt::CaseSensitive;
|
||||
#endif
|
||||
return dir.originalRepresentation == listDir
|
||||
|| QDir::cleanPath(dir.originalRepresentation).compare(QDir::cleanPath(listDir), caseSensitivity) == 0;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user