From 146a2eef5fe35acb65ae5fe7b8ebad771cbd448e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 2 Nov 2016 10:14:58 +0100
Subject: [PATCH] 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>
---
 config_help.txt        | 1 +
 src/gui/configure.json | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config_help.txt b/config_help.txt
index 296bf807d9e..5e0d36a41f7 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -252,6 +252,7 @@ Gui, printing, widget options:
   -xcb-xlib............. Enable Xcb-Xlib support [auto]
 
   Platform backends:
+    -direct2d .......... Enable Direct2D support [auto] (Windows only)
     -directfb .......... Enable DirectFB support [no] (Unix only)
     -eglfs ............. Enable EGLFS support [auto; no on Android and Windows]
     -gbm ............... Enable backends for GBM [auto] (Linux only)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index f4e2faf08ba..9fb4a971c32 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": {