From 36ad7d21581efd240bbe1a94cb16e1b32e692d1c Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 10 Oct 2018 14:23:17 +0200
Subject: Use common Qt settings instead of setting C++14 explicit in core API

Makes it unnecessary for us to try match Qt settings. Only done for API,
due to the rest of core being built by GN.

Change-Id: Ib9f8acb7e99ae22dd2d7281c9082d822f1d238eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/core/api/core_api.pro | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index e0600e6fe..38dc6b39d 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -3,7 +3,7 @@ DESTDIR = $$OUT_PWD/$$getConfigDir()
 
 TEMPLATE = lib
 
-CONFIG += staticlib c++14
+CONFIG += staticlib
 QT += network core-private webenginecoreheaders-private
 
 # Don't create .prl file for this intermediate library because
@@ -27,7 +27,7 @@ INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core \
                $$CHROMIUM_GEN_DIR \
                $$CHROMIUM_SRC_DIR
 
-linux-g++*: QMAKE_CXXFLAGS += -Wno-unused-parameter
+gcc: QMAKE_CXXFLAGS_WARN_ON = -Wno-unused-parameter
 
 HEADERS = \
     qwebenginecallback.h \
@@ -59,6 +59,7 @@ SOURCES = \
 
 ### Qt6 Remove this workaround
 unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
+    CONFIG -= warning_clean
     SOURCES += qtbug-60565.cpp \
                qtbug-61521.cpp
 }
@@ -70,3 +71,5 @@ msvc {
         "if exist $(DESTDIR_TARGET).objects del $(DESTDIR_TARGET).objects$$escape_expand(\\n\\t)" \
         "for %%a in ($(OBJECTS)) do echo $$shell_quote($$shell_path($$OUT_PWD))\\%%a >> $(DESTDIR_TARGET).objects"
 }
+
+load(qt_common)
-- 
cgit v1.2.3