Add correct core count detection for i7(and maybe i5/i3?) CPUs, and update the SysInfo screen to show more information about threads on x86/x64.
Ifdef away the detection on non-Windows for now.
Merge pull request #4228 from thedax/i7CPUDetection

System Info screen: Add correct core count detection for i7(and maybe i5/i3?) CPUs.
Change shaders install path for Qt to match up with code.
Avoid a divide by zero error on non-Core i cpus.

Also support Linux and, why not, Android too.
Merge pull request #4233 from unknownbrackets/cpudetect

Avoid a divide by zero error on non-Core i cpus.
Some formatting cleanup.

Yeah, I said we shouldn't do big overhauls..
Clear the symbol map in LoadExec. Fixes some hangs on switching games,
unclear why.
Buildfix
Move default log file to g_Config.memCardDirectory/PSP/SYSTEM/Logs/ppsspp.log.
Disable default logging(--log still works fine), delete CommonPaths.h, and remove unused funcs in FileUtil.
Clean up FileUtil.h. Remove GetBundleDirectory(I searched master and nothing uses it either).
Merge pull request #4214 from thedax/adjustLogDirectory

Non-USING_GLES2 platforms: Move default log file location.
Revert "Clear the symbol map in LoadExec. Fixes some hangs on switching games,"

This reverts commit 6c3f2155c7a294c83770e7e9161c0a0c161384b0.
Clear symbol map in AttemptLoadSymbolmap on non-windows
Buildfix for Qt on Windows. Rearrange parts of the Qt project file.
Buildfix for Qt, Qt5, Windows on Qt.
Merge remote-tracking branch 'upstream/master' into fps2

Conflicts:
	native