From ae273bcf42e47d674f32e4132027928c76631466 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 1 Feb 2018 10:34:04 -0800 Subject: libjpeg: silence warnings with clang as well as gcc The check was broken anyways since the compiler filename is not guaranteed to be "gcc" in all cases when using GCC. Change-Id: I9f242ef26c6fea6d2fedda0391f8c7bef264f1ef Reviewed-by: Gabriel de Dietrich --- src/3rdparty/libjpeg.pri | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index a61f28dc5a..0d35bf8941 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -7,10 +7,8 @@ DEFINES += \ JPEG_LIB_VERSION=80 \ SIZEOF_SIZE_T=__SIZEOF_SIZE_T__ -#Disable warnings in 3rdparty code due to unused arguments -contains(QMAKE_CC, gcc): { - QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main -} +# Disable warnings in 3rdparty code due to unused arguments +gcc: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main INCLUDEPATH += $$PWD/libjpeg/src -- cgit v1.2.3