summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-03-28 17:14:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-08 14:00:10 +0200
commit96425960f9d57387c33e3ba50785aaa81255bc98 (patch)
tree01799f1235c85ffef420c06c5598ebd4e028339e /src/src.pro
parent84f31c11b77a62212451cb77adae63219e06de96 (diff)
Render the widgets view using the scene graph into a QOpenGLWidget
This means that widgets application now need to setup the GL context sharing as well. QWebEngineWidgets::initialize() must be called, which has the same effect as QWebEngine::initialize(). The QtWebEngineWidgets now depends on the QtWebEngine module to make this happen. Since QOpenGLWidget is only available in Qt 5.3, this patch also disables the webenginewidgets module completely when building using Qt 5.2. Change-Id: I0e99a779d1eb080f2ccf5a338ff0763ad64e6eba Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro
index 536fcad5c..6d902497f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
process.depends = core
webengine.depends = core
-webenginewidgets.depends = core
+webenginewidgets.depends = core webengine
webengine_plugin.subdir = webengine/plugin
webengine_plugin.target = sub-webengine-plugin
webengine_plugin.depends = webengine
@@ -21,6 +21,6 @@ SUBDIRS += core \
# Another example of where this could be necessary is to make it easy to build proprietery codecs support.
!contains(WEBENGINE_CONFIG, no_ui_delegates): SUBDIRS += webengine/ui
-qtHaveModule(widgets) {
+qtHaveModule(widgets):equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 2) {
SUBDIRS += webenginewidgets
}