Merge remote-tracking branch 'upstream/master'

Author: ethanaobrien

.editorconfig

@@ -26,9 +26,6 @@ charset = utf-8-bom
 # This file may need to force a BOM so compilers treat as utf-8.
 charset = utf-8-bom
 
-[Windows/{aboutbox.rc,version.rc}]
-charset = utf-8
-
 [ext/at3_standalone/**.{cpp,h}]
 indent_style = space
 indent_size = 4

.gitattributes

@@ -11,4 +11,4 @@
 *.xml            text
 
 # To avoid mucking up the utf-8 characters.
-Core/Dialog/PSPOskDialog.cpp binary
+Core/Dialog/PSPOskConstants.cpp binary

.github/workflows/build.yml

@@ -207,6 +207,7 @@ jobs:
       if: matrix.extra == 'qt'
       with:
         cache: true
+        version: 5.15.2
 
     - uses: nttld/setup-ndk@v1
       if: matrix.extra == 'android'

.gitignore

@@ -132,6 +132,8 @@ debian/ppsspp/
 
 # CMake stuff
 CMakeFiles
+CMakeUserPresets.json
+compile_commands.json
 
 # Clangd 
 .cache/

.ycm_extra_conf.py

@@ -50,7 +50,7 @@
 # a "-std=<something>".
 # For a C project, you would set this to something like 'c99' instead of
 # 'c++11'.
-'-std=c++11',
+'-std=c++17',
 # ...and the same thing goes for the magic -x option which specifies the
 # language that the files to be compiled are written in. This is mostly
 # relevant for c++ headers.