diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-09-13 19:12:38 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-20 10:43:09 +0000 |
| commit | 1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 (patch) | |
| tree | daf2617622536fc9c96ed9818ecba3d892f999b7 /src/core/core_chromium.pri | |
| parent | c9b3baa2e2825df6b06e7366d154341f73d4e326 (diff) | |
Remove WEBENGINE_CONFIG from configure
Do not store flags in qmake.cache with WEBENGINE_CONFIG.
Use directly qtConfig values insted. This makes configuration
more consistent, simplifies handling and avoids passing
values from qtConfig to WEBENIGNE_CONFIG, which then
were passed to gn.
[ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure
Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/core/core_chromium.pri')
| -rw-r--r-- | src/core/core_chromium.pri | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index b76469833..71f74f51a 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -28,7 +28,7 @@ RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc # Assume that we want mobile touch and low-end hardware behaviors # whenever we are cross compiling. -contains(WEBENGINE_CONFIG, embedded_build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES +qtConfig(embedded): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES qtConfig(egl): CONFIG += egl @@ -187,13 +187,8 @@ HEADERS = \ web_engine_settings.h \ web_event_factory.h +qtConfig(pepper-plugins) { -use?(pdf) { - SOURCES += pdfium_document_wrapper_qt.cpp - HEADERS += pdfium_document_wrapper_qt.h -} - -use?(pepper_plugins) { SOURCES += \ renderer_host/pepper/pepper_flash_browser_host_qt.cpp \ renderer_host/pepper/pepper_host_factory_qt.cpp \ @@ -209,7 +204,8 @@ use?(pepper_plugins) { renderer/pepper/pepper_renderer_host_factory_qt.h } -use?(printing) { +qtConfig(printing-and-pdf) { + SOURCES += \ printing_message_filter_qt.cpp \ print_view_manager_base_qt.cpp \ @@ -221,6 +217,10 @@ use?(printing) { print_view_manager_base_qt.h \ print_view_manager_qt.h \ renderer/print_web_view_helper_delegate_qt.h + + # pdf sources + SOURCES += pdfium_document_wrapper_qt.cpp + HEADERS += pdfium_document_wrapper_qt.h } contains(QT_CONFIG, opengl) { |