From b37c5f6fc5054bbb149d095bae9e2eb7cee36f62 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@heap.zone>
Date: Sat, 15 Apr 2017 04:42:37 +0200
Subject: [PATCH] Make Qt project work on non-Mac systems

---
 ObjQt.pro | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ObjQt.pro b/ObjQt.pro
index c9c0e93..6a3eaf9 100644
--- a/ObjQt.pro
+++ b/ObjQt.pro
@@ -35,9 +35,17 @@ SOURCES += common/OFString+QString.mm	\
 	   QtWidgets/QtApplication.mm	\
 	   QtWidgets/QtWidget.mm
 
-QMAKE_CXXFLAGS += $$system("objfw-config --cppflags --objcflags --cxxflags")
-QMAKE_CXXFLAGS_WARN_ON = -Wall					\
-			 -Werror				\
-			 -Wsemicolon-before-method-body		\
-			 -Wobjc-missing-property-synthesis
+OBJCFLAGS += $$system("objfw-config --cppflags --objcflags --cxxflags")
+OBJCFLAGS_WARN_ON = -Wall				\
+		    -Werror				\
+		    -Wsemicolon-before-method-body	\
+		    -Wobjc-missing-property-synthesis
+
+# qmake treats .mm files as C++ on Mac, but as C on everything else
+macx:QMAKE_CXXFLAGS += $$OBJCFLAGS
+macx:QMAKE_CXXFLAGS_WARN_ON = $$OBJCFLAGS_WARN_ON
+!macx:QMAKE_CC = clang++
+!macx:QMAKE_CFLAGS += -std=c++11 $$OBJCFLAGS
+!macx:QMAKE_CFLAGS_WARN_ON = $$OBJCFLAGS_WARN_ON
+
 LIBS += $$system("objfw-config --ldflags --libs")