summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2018-02-01 10:34:04 -0800
committerJake Petroules <jake.petroules@qt.io>2018-02-07 20:00:34 +0000
commitae273bcf42e47d674f32e4132027928c76631466 (patch)
tree455081fdcc507e3a88c54130386831d2814b97b8 /src/3rdparty
parent2af3cb4436fe6cd79dc7a377f87815fc96832ce5 (diff)
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 <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/libjpeg.pri6
1 files 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