Fix build on Qt 5.15 Beta 2

Reverts most of 10dae7482c
2020-03-23 18:30:56 -07:00 · 2020-03-23 18:30:56 -07:00 · 6c980eba68
commit 6c980eba68
parent e9f766904e
6 changed files with 17 additions and 22 deletions
--- a/app/settings/mappingmanager.cpp
+++ b/app/settings/mappingmanager.cpp
@ -26,7 +26,13 @@ MappingManager::MappingManager()
    settings.endArray();

    // Finally load mappings from SDL_HINT_GAMECONTROLLERCONFIG
-    QStringList sdlMappings = QString::fromLocal8Bit(SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG)).split('\n', QString::SkipEmptyParts);
+    QStringList sdlMappings =
+            QString::fromLocal8Bit(SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG))
+        #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            .split('\n', Qt::SkipEmptyParts);
+        #else
+            .split('\n', QString::SkipEmptyParts);
+        #endif
    for (QString sdlMapping : sdlMappings) {
        SdlGamepadMapping mapping(sdlMapping);
        addMapping(mapping);