diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-18 08:01:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-18 08:01:52 +0000 |
| commit | 3a0764d625a18233006ca438226281bc3c6740c5 (patch) | |
| tree | b40076ee56d61cc4491a2326784e435e39ea6883 /src/gui/configure.json | |
| parent | dafd0955c601fc00f9164f9b955ec9f28b627565 (diff) | |
| parent | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index cc2f0f303b..3f139cf02d 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -9,6 +9,7 @@ "options": { "android-style-assets": "boolean", "angle": "boolean", + "direct2d": "boolean", "directfb": "boolean", "directwrite": "boolean", "egl": "boolean", @@ -455,8 +456,7 @@ }, "direct2d": { "label": "Direct 2D", - "autoDetect": false, - "condition": "config.win32 && libs.direct2d", + "condition": "config.win32 && !config.winrt && libs.direct2d", "output": [ "privateFeature" ] }, "evdev": { @@ -861,6 +861,12 @@ "condition": "features.library", "output": [ "publicFeature", "feature" ] }, + "highdpiscaling": { + "label": "High DPI Scaling", + "purpose": "Provides automatic scaling of DPI-unaware applications on high-DPI displays.", + "section": "Kernel", + "output": [ "publicFeature", "feature" ] + }, "validator": { "label": "QValidator", "purpose": "Supports validation of input text.", |