diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-10 10:50:19 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-11 10:17:46 +0000 |
commit | c11cfb5d6b251e908c75a47fe76a62b3907c6baf (patch) | |
tree | 440a3beef51fd6a79f684ee3008d09697fde4e12 | |
parent | 8b0f6b343dd807236001cacbae9bacb7e4923369 (diff) |
Chromium requires C++14
QtWebEngineCore was only building because Chromium CPPFLAGS was
overriding ours. And setting C++11 in our examples and tests now forces
a downgrade.
Change-Id: I3642394f15bb9974688991800552624d2379faf9
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/cookiebrowser.pro | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/markdowneditor/markdowneditor.pro | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/simplebrowser.pro | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/spellchecker/spellchecker.pro | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.pro | 1 | ||||
-rw-r--r-- | mkspecs/features/platform.prf | 4 | ||||
-rw-r--r-- | src/core/core_common.pri | 3 | ||||
-rw-r--r-- | tests/auto/core/tests.pri | 1 | ||||
-rw-r--r-- | tests/auto/quick/tests.pri | 1 | ||||
-rw-r--r-- | tests/quicktestbrowser/quicktestbrowser.pro | 1 |
10 files changed, 5 insertions, 10 deletions
diff --git a/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro b/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro index 6b249cf59..91f80abff 100644 --- a/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro +++ b/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro @@ -1,7 +1,6 @@ QT += core gui webenginewidgets TARGET = cookiebrowser TEMPLATE = app -CONFIG += c++11 SOURCES += \ main.cpp\ diff --git a/examples/webenginewidgets/markdowneditor/markdowneditor.pro b/examples/webenginewidgets/markdowneditor/markdowneditor.pro index 7ffbd7487..099edf4b5 100644 --- a/examples/webenginewidgets/markdowneditor/markdowneditor.pro +++ b/examples/webenginewidgets/markdowneditor/markdowneditor.pro @@ -1,7 +1,6 @@ TEMPLATE = app QT += webenginewidgets webchannel -CONFIG += c++11 HEADERS += \ mainwindow.h \ diff --git a/examples/webenginewidgets/simplebrowser/simplebrowser.pro b/examples/webenginewidgets/simplebrowser/simplebrowser.pro index 8120a2852..7584cfb01 100644 --- a/examples/webenginewidgets/simplebrowser/simplebrowser.pro +++ b/examples/webenginewidgets/simplebrowser/simplebrowser.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = simplebrowser QT += webenginewidgets -CONFIG += c++11 HEADERS += \ browser.h \ diff --git a/examples/webenginewidgets/spellchecker/spellchecker.pro b/examples/webenginewidgets/spellchecker/spellchecker.pro index 682f118fe..d652e4b1f 100644 --- a/examples/webenginewidgets/spellchecker/spellchecker.pro +++ b/examples/webenginewidgets/spellchecker/spellchecker.pro @@ -4,7 +4,6 @@ QT_FOR_CONFIG += webenginecore TEMPLATE = app TARGET = spellchecker QT += webenginewidgets -CONFIG += c++11 !qtConfig(webengine-spellchecker) { error("Qt WebEngine compiled without spellchecker support, this example will not work.") diff --git a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.pro b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.pro index c5f1080e3..a9ff54400 100644 --- a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.pro +++ b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = stylesheetbrowser QT += webenginewidgets -CONFIG += c++11 HEADERS += \ mainwindow.h \ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index 0a2e4b1ef..f41a43925 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -62,8 +62,8 @@ defineTest(isPlatformSupported) { return(false) } - !contains(QT_CONFIG, c++11) { - skipBuild("C++11 support is required in order to build chromium.") + !contains(QT_CONFIG, c++14) { + skipBuild("C++14 support is required in order to build chromium.") return(false) } qtConfig(mirclient) { diff --git a/src/core/core_common.pri b/src/core/core_common.pri index ce0eecce2..5f9f3c4f6 100644 --- a/src/core/core_common.pri +++ b/src/core/core_common.pri @@ -10,3 +10,6 @@ qtConfig(webengine-webchannel): QT += webchannel # LTO does not work for Chromium at the moment, so disable it completely for core. CONFIG -= ltcg + +# Chromium requires C++14 +CONFIG += c++14 diff --git a/tests/auto/core/tests.pri b/tests/auto/core/tests.pri index 19f53f12d..885cf60d4 100644 --- a/tests/auto/core/tests.pri +++ b/tests/auto/core/tests.pri @@ -1,7 +1,6 @@ TEMPLATE = app CONFIG += testcase -CONFIG += c++11 VPATH += $$_PRO_FILE_PWD_ TARGET = tst_$$TARGET diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri index f809ebd68..f7104ad9c 100644 --- a/tests/auto/quick/tests.pri +++ b/tests/auto/quick/tests.pri @@ -4,7 +4,6 @@ QT_FOR_CONFIG += webenginecore-private TEMPLATE = app CONFIG += testcase -CONFIG += c++11 VPATH += $$_PRO_FILE_PWD_ TARGET = tst_$$TARGET diff --git a/tests/quicktestbrowser/quicktestbrowser.pro b/tests/quicktestbrowser/quicktestbrowser.pro index b4fb9a58d..8c6b8a111 100644 --- a/tests/quicktestbrowser/quicktestbrowser.pro +++ b/tests/quicktestbrowser/quicktestbrowser.pro @@ -20,7 +20,6 @@ OTHER_FILES += ApplicationRoot.qml \ RESOURCES += resources.qrc QT += qml quick webengine -CONFIG += c++11 qtHaveModule(widgets) { QT += widgets # QApplication is required to get native styling with QtQuickControls |