diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-05-19 01:01:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 01:01:57 +0200 |
| commit | a53279f1427e88b87100c038bd8f95a88fabee6a (patch) | |
| tree | 7bed27cdb9b7f65296e9297814de33108c34ac4c /src/preferences | |
| parent | 53169bbc2fad6b76b74942a719f251f995564aa8 (diff) | |
| parent | 2c29f2cc631f84a7b6db776856251fa0a1df091e (diff) | |
Merge pull request #3876 from Holzhaus/extra-warnings
CMake: Add -Wformat=2 and -Wundef warnings
Diffstat (limited to 'src/preferences')
| -rw-r--r-- | src/preferences/upgrade.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/preferences/upgrade.cpp b/src/preferences/upgrade.cpp index e457de3eb6..4a678e6727 100644 --- a/src/preferences/upgrade.cpp +++ b/src/preferences/upgrade.cpp @@ -200,7 +200,7 @@ UserSettingsPointer Upgrade::versionUpgrade(const QString& settingsPath) { configVersion = config->getValueString(ConfigKey("[Config]","Version")); } else { -#elif __WINDOWS__ +#elif defined(__WINDOWS__) qDebug() << "Config version is empty, trying to read pre-1.12.0 config"; // Try to read the config from the pre-1.12.0 final directory on Windows (we moved it in 1.12.0 final) QScopedPointer<QFile> oldConfigFile(new QFile(QDir::homePath().append("/Local Settings/Application Data/Mixxx/mixxx.cfg"))); @@ -227,7 +227,7 @@ UserSettingsPointer Upgrade::versionUpgrade(const QString& settingsPath) { return config; #ifdef __APPLE__ } -#elif __WINDOWS__ +#elif defined(__WINDOWS__) } #endif } |