From 010517910f60b1a2ecc447bf8279e40f7b38821c Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Thu, 26 Jun 2014 17:59:00 +1000
Subject: [PATCH] Qt: Revert annoying git_version string to support all qmake's
 + symbian.

---
 Qt/Settings.pri | 14 +++++++++-----
 native          |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index 1b4ab56a13..ba6840fa33 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -13,11 +13,15 @@ UI_DIR = $$CONFIG_DIR/.ui/$$TARGET
 P = $$_PRO_FILE_PWD_/..
 INCLUDEPATH += $$P/ext/zlib $$P/Common
 
-exists($$P/.git): GIT_VERSION = $$system(git describe --always)
-isEmpty(GIT_VERSION): GIT_VERSION = $$VERSION
-symbian: DEFINES += "PPSSPP_GIT_VERSION=\"$$GIT_VERSION\""
-else:greaterThan(QT_MAJOR_VERSION,4): DEFINES += PPSSPP_GIT_VERSION=$$shell_quote(\"$$GIT_VERSION\")
-else: DEFINES += PPSSPP_GIT_VERSION=$$quote($$GIT_VERSION)
+symbian {
+  exists($$P/.git): GIT_VERSION = $$system(git describe --always)
+  isEmpty(GIT_VERSION): GIT_VERSION = $$VERSION
+} else {
+  # QMake seems to change how it handles quotes with every version. This works for most systems:
+  exists($$P/.git): GIT_VERSION = '\\"$$system(git describe --always)\\"'
+  isEmpty(GIT_VERSION): GIT_VERSION = '\\"$$VERSION\\"'
+}
+DEFINES += PPSSPP_GIT_VERSION=\"$$GIT_VERSION\"
 
 win32-msvc* {
 	QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast
diff --git a/native b/native
index 9c0d44ceb0..320f5f1952 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 9c0d44ceb0b628b5d66f9257e8f59cf97a9ab888
+Subproject commit 320f5f1952c1c462e67c634af7455105967fc602