summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-11-02 10:14:58 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-11-07 18:52:02 +0000
commit146a2eef5fe35acb65ae5fe7b8ebad771cbd448e (patch)
tree9f7d9b24d144b93cb9707915e11e14945b1be53f /src
parent25a2717f66006ba020d12c5666f8f45d3ccf8756 (diff)
Re-add configure option for Direct2D QPA plugin
This also allows us to enable auto-detection for it. Change-Id: I7639ab533553f02e691e6f6b8cdd8dff19d91809 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/gui/configure.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index f4e2faf08b..9fb4a971c3 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",
@@ -446,8 +447,7 @@
},
"direct2d": {
"label": "Direct 2D",
- "autoDetect": false,
- "condition": "config.win32 && libs.direct2d",
+ "condition": "config.win32 && !config.winrt && libs.direct2d",
"output": [ "privateFeature" ]
},
"evdev": {