diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:49:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:52:24 +0100 |
commit | 0c034a649f61019c16aba479fe79d20dde41f2f2 (patch) | |
tree | 54545862591044b65e618989805945bceb0b3ea5 /src/gui/configure.json | |
parent | 2162f01111d21d0ce66ceb8be290b0a13653e691 (diff) | |
parent | df40b1115db600e8de1c4774476fa30956a34fd9 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qpushbutton.cpp
Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81
Diffstat (limited to 'src/gui/configure.json')
-rw-r--r-- | src/gui/configure.json | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index e627d6286f..a8ae656bcb 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -170,7 +170,7 @@ "label": "Mir client libraries", "test": "qpa/mirclient", "sources": [ - { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api libcontent-hub" } + { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api libcontent-hub >= 0.2.0" } ] }, "mtdev": { @@ -534,12 +534,19 @@ "linuxfb": { "label": "LinuxFB", "section": "Platform plugins", - "condition": "tests.linuxfb", + "condition": "tests.linuxfb && features.regularexpression", + "output": [ "privateFeature" ] + }, + "vnc": { + "label": "VNC", + "section": "Platform plugins", + "condition": "config.unix && !config.android && !config.darwin && features.regularexpression", "output": [ "privateFeature" ] }, "mirclient": { "label": "Mir client", "section": "Platform plugins", + "autoDetect": false, "condition": "libs.mirclient", "output": [ "privateFeature" ] }, @@ -889,7 +896,6 @@ "label": "QImageIOPlugin", "purpose": "Provides a base for writing a image format plugins.", "section": "Images", - "condition": "features.library", "output": [ "publicFeature", "feature" ] }, "movie": { @@ -1114,7 +1120,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla "eglfs_viv", "eglfs_viv_wl", "eglfs_egldevice", "eglfs_gbm", "eglfs_mali", "eglfs_brcm", "egl_x11" ] }, - "linuxfb", "mirclient", + "linuxfb", "vnc", "mirclient", { "type": "feature", "message": "INTEGRITY framebuffer", |