From a91c355062f42cf8dc478a286609c204ca978d30 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Wed, 4 Jan 2017 13:03:06 +0000 Subject: [PATCH] Remove qt warning settings and use renderdoc ones Disable warnings in qt (warn_off) then remove -w from qt compiler flags to re-enable previous renderdoc warnings Use qt standard way to enable c++11 eg CONFIG += c++11 --- qrenderdoc/qrenderdoc.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index ce7b0ccab..971b6f44d 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -77,7 +77,10 @@ win32 { LIBS += -L$$DESTDIR -lrenderdoc QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN\'' - QMAKE_CXXFLAGS += -std=c++11 + CONFIG += warn_off + CONFIG += c++11 + QMAKE_CFLAGS_WARN_OFF -= -w + QMAKE_CXXFLAGS_WARN_OFF -= -w macx: { DEFINES += RENDERDOC_PLATFORM_POSIX RENDERDOC_PLATFORM_APPLE