diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:34:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:44:57 +0200 |
commit | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (patch) | |
tree | af152f5ace10bdc5996ac0fb7cc7fd897928d60a /src/core/core_chromium.pri | |
parent | 73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e (diff) | |
parent | 9fdc847c639ef7060a13b10d9fe704e40357a0a8 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/webengine/api/qquickwebenginesettings_p.h
src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
Change-Id: I9cac7059557084a575af02782af886f55a8d404f
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 41aa2f193..6b43b08b7 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 @@ -194,13 +194,8 @@ HEADERS = \ web_event_factory.h \ webui/webui_controller_factory_qt.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 \ @@ -216,7 +211,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 \ @@ -228,6 +224,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) { |