From 1cd89a019c002ddc8ebd6c0f0f0cd81be5c5fe67 Mon Sep 17 00:00:00 2001 From: thesource Date: Thu, 21 Apr 2016 12:31:56 +0300 Subject: [PATCH] Build fix for linux using Qt build tools. Corrects gcc version detection. Before patch some lines in g++ --vesrion output could be incorrectly recognized as version 4.6 and therefore keyword "override" would be declared as macro despite being known to compiler. This was leading to compile error. Should fix #8695. --- Qt/Native.pro | 2 +- Qt/PPSSPP.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Qt/Native.pro b/Qt/Native.pro index 3b2b560e39..c16f41476d 100644 --- a/Qt/Native.pro +++ b/Qt/Native.pro @@ -7,7 +7,7 @@ CONFIG += staticlib include(Settings.pri) # To support Sailfish which is stuck on GCC 4.6 -linux-g++:system($$QMAKE_CXX --version | grep "4.6."): DEFINES+=override +linux-g++:system($$QMAKE_CXX --version | grep \"4\.6\.\"): DEFINES+=override INCLUDEPATH += $$P/ext/native diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 6979400d82..8d6f2ba856 100644 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -10,7 +10,7 @@ else: LIBS += -lCore -lGPU -lCommon -lNative include(Settings.pri) # To support Sailfish which is stuck on GCC 4.6 -linux-g++:system($$QMAKE_CXX --version | grep "4.6."): DEFINES+=override +linux-g++:system($$QMAKE_CXX --version | grep \"4\.6\.\"): DEFINES+=override lessThan(QT_MAJOR_VERSION, 5) { macx: error(PPSSPP requires Qt5 for OS X but $$[QT_VERSION] was detected.)