Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CMakeLists.txt
#	Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
#	Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
#	Source/Android/app/src/main/res/menu/menu_emulation.xml
#	Source/Android/app/src/main/res/values/strings.xml
#	Source/Android/jni/MainAndroid.cpp
#	Source/Core/VideoCommon/HiresTextures.cpp
#	Source/Core/VideoCommon/HiresTextures.h
#	Source/Core/VideoCommon/RenderBase.cpp

.editorconfig

@@ -1,10 +1,11 @@
 root = true
 
 [*]
+charset = utf-8
 indent_size = 2
 trim_trailing_whitespace = true
 
-[*.{c,cpp,h}]
+[*.{c,cpp,h,java}]
 indent_style = space
 insert_final_newline = true
 max_line_length = 100
@@ -20,10 +21,6 @@ indent_size = 4
 indent_style = space
 insert_final_newline = false
 
-[*.java]
-indent_style = tab
-insert_final_newline = true
-
 [*.xml]
 indent_size = 4
 indent_style = space

.git-blame-ignore-revs

@@ -0,0 +1,11 @@
+# This file can be used for git blame using --ignore-revs-file
+# or by setting blame.ignoreRevsFile in the git config.
+
+# Remove unnecessary Src/ folders
+34692ab826abc8f8faa61bdb2280b742424528f1
+
+# Reformat C++ code
+3570c7f03a2aa90aa634f96c0af1969af610f14d
+
+# Reformat Android code
+248ee12aed057acd0bdd310359c328e8d4fd5e5a

.gitignore

@@ -6,9 +6,10 @@ Thumbs.db
 Source/Core/Common/scmrev.h
 # Ignore files output by build
 /[Bb]uild*/
-/[Bb]inary/
+/[Bb]inary*/
 /obj/
-# Android cmake builds to here then copies to Source/Android.
+# Ignore files output by Android cmake build
+/Source/Android/app/.cxx/
 /libs/
 # Ignore various files created by visual studio/msbuild
 *.ipch
@@ -20,7 +21,8 @@ Source/Core/Common/scmrev.h
 *.tlog
 *.VC.opendb
 *.VC.db
-.vs/
+.vs*/
+/Source/enc_temp_folder/
 # Ignore build info file created by QtCreator
 CMakeLists.txt.user
 # Ignore files created by posix people
@@ -34,3 +36,5 @@ CMakeLists.txt.user
 *.kdev4
 # Ignore IDEA/Clion files/dirs
 /.idea/
+# Ignore Visual Studio Code's working dir
+/.vscode/

.gitmodules

@@ -2,3 +2,4 @@
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
 	branch = master
+	shallow = true

CMake/CheckVendoringApproved.cmake

@@ -0,0 +1,29 @@
+# When packaging Dolphin for an OS distribution, distro vendors usually prefer
+# to limit vendored ("Externals") dependencies as much as possible, in favor of
+# using system provided libraries. This modules provides an option to allow
+# only specific vendored dependencies and error-out at configuration time for
+# non-approved ones.
+#
+# Usage:
+#  $ cmake -D APPROVED_VENDORED_DEPENDENCIES="a;b;c;..."
+#
+# Unless the option is explicitly used, vendored dependencies control is
+# disabled.
+#
+# If you want to disallow all vendored dependencies, put "none" in the approved
+# dependencies list.
+
+set(APPROVED_VENDORED_DEPENDENCIES "" CACHE STRING "\
+Semicolon separated list of approved vendored dependencies. See docstring in \
+CMake/CheckVendoringApproved.cmake.")
+
+function(check_vendoring_approved dep)
+  if(APPROVED_VENDORED_DEPENDENCIES)
+    if(NOT dep IN_LIST APPROVED_VENDORED_DEPENDENCIES)
+      message(SEND_ERROR "\
+Library ${dep} was not found systemwide and was not approved for vendoring. \
+Vendored dependencies control is enabled. Add \"${dep}\" to the \
+APPROVED_VENDORED_DEPENDENCIES list to bypass this error.")
+    endif()
+  endif()
+endfunction()

CMake/DolphinPostprocessBundle.cmake

@@ -21,7 +21,7 @@ if(CMAKE_GENERATOR)
 	return()
 endif()
 
-get_filename_component(DOLPHIN_BUNDLE_PATH "${DOLPHIN_BUNDLE_PATH}" REALPATH)
+get_filename_component(DOLPHIN_BUNDLE_PATH "${DOLPHIN_BUNDLE_PATH}" ABSOLUTE)
 message(STATUS "Fixing up application bundle: ${DOLPHIN_BUNDLE_PATH}")
 
 # Make sure to fix up any additional shared libraries (like plugins) that are

CMake/FindBlueZ.cmake

@@ -6,7 +6,7 @@
 #
 # vim: expandtab sw=4 ts=4 sts=4:
 
-include(FindPkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules (BlueZ_PKG QUIET bluez)
 
 find_path(BlueZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h

CMake/FindLibevdev.cmake → CMake/FindLIBEVDEV.cmake

@@ -27,7 +27,7 @@ set(LIBEVDEV_LIBRARIES ${LIBEVDEV_LIBRARY} )
 set(LIBEVDEV_INCLUDE_DIRS ${LIBEVDEV_INCLUDE_DIR} )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(libevdev  DEFAULT_MSG
+find_package_handle_standard_args(LIBEVDEV  DEFAULT_MSG
                                   LIBEVDEV_LIBRARY LIBEVDEV_INCLUDE_DIR)
 
 mark_as_advanced(LIBEVDEV_INCLUDE_DIR LIBEVDEV_LIBRARY )

CMake/FindPulseAudio.cmake

@@ -6,7 +6,7 @@
 #
 # vim: expandtab sw=4 ts=4 sts=4:
 
-include(FindPkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules (PulseAudio_PKG QUIET libpulse)
 
 find_path(PulseAudio_INCLUDE_DIR NAMES pulse/pulseaudio.h

CMake/FindLibsystemd.cmake → CMake/FindSYSTEMD.cmake

@@ -1,5 +1,6 @@
-include(FindPkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SYSTEMD QUIET "libsystemd")
+
 if (PC_SYSTEMD_FOUND)
 	add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
 endif(PC_SYSTEMD_FOUND)