summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/webenginewidgets.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-09-22 12:34:40 +0200
committerLiang Qi <liang.qi@qt.io>2017-09-22 12:44:57 +0200
commit05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (patch)
treeaf152f5ace10bdc5996ac0fb7cc7fd897928d60a /src/webenginewidgets/webenginewidgets.pro
parent73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e (diff)
parent9fdc847c639ef7060a13b10d9fe704e40357a0a8 (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/webenginewidgets/webenginewidgets.pro')
-rw-r--r--src/webenginewidgets/webenginewidgets.pro14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 96341d58c..29c961c80 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
TARGET = QtWebEngineWidgets
# For our export macros
@@ -44,23 +47,20 @@ HEADERS = \
api/qwebengineview_p.h \
render_widget_host_view_qt_delegate_widget.h
-!contains(WEBENGINE_CONFIG, no_ui_delegates) {
+qtConfig(ui-delegates) {
SOURCES += ui/messagebubblewidget.cpp
HEADERS += ui/messagebubblewidget_p.h
DEFINES += QT_UI_DELEGATES
}
-contains(WEBENGINE_CONFIG, use_spellchecker) {
+qtConfig(spellchecker) {
DEFINES += ENABLE_SPELLCHECK
}
-use?(printing) {
+qtConfig(printing-and-pdf) {
DEFINES += ENABLE_PRINTING
- QT += printsupport
-}
-
-use?(pdf) {
DEFINES += ENABLE_PDF
+ QT += printsupport
}
load(qt_module)