diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-01-18 16:26:29 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-01-18 16:26:29 +0100 |
| commit | 819182302d5bdaba41efb68ef3c533b2acc19ae1 (patch) | |
| tree | cab7a922998bc5d6e7f42b537b0c0ce1b69111f6 /src/core/configure.json | |
| parent | 0763b7c40d3490250f5bca1e0029cefba635305c (diff) | |
| parent | 3f7ea91e23d82e676aeaf157736e25cf54e5ec6b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/core/net/network_delegate_qt.cpp
src/core/profile_io_data_qt.cpp
src/core/web_engine_context.h
tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
Change-Id: Id98e3f52f548ceb5b68abd80aedd6ae59db72cc0
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index e17605302..044d85527 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -75,12 +75,6 @@ { "type": "pkgConfig", "args": "xi" } ] }, - "webengine-xrandr": { - "label": "xrandr", - "sources": [ - { "type": "pkgConfig", "args": "xrandr" } - ] - }, "webengine-xtst": { "label": "xtst", "sources": [ @@ -366,11 +360,6 @@ "condition": "libs.webengine-xi", "output": [ "privateFeature" ] }, - "webengine-system-xrandr": { - "label": "xrandr", - "condition": "libs.webengine-xrandr", - "output": [ "privateFeature" ] - }, "webengine-system-xtst": { "label": "xtst", "condition": "libs.webengine-xtst", @@ -825,7 +814,6 @@ "webengine-system-xcomposite", "webengine-system-xcursor", "webengine-system-xi", - "webengine-system-xrandr", "webengine-system-xtst" ] } |