From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 5 Jun 2020 09:24:37 +0200 Subject: Remove winrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø --- configure.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.json') diff --git a/configure.json b/configure.json index c174b45262..fee86ede81 100644 --- a/configure.json +++ b/configure.json @@ -807,7 +807,7 @@ "appstore-compliant": { "label": "App store compliance", "purpose": "Disables code that is not allowed in platform app stores", - "autoDetect": "config.uikit || config.android || config.winrt", + "autoDetect": "config.uikit || config.android", "output": [ "publicFeature" ] }, "simulator_and_device": { @@ -859,7 +859,7 @@ }, "largefile": { "label": "Large file support", - "condition": "!config.android && !config.integrity && !config.winrt && !config.rtems", + "condition": "!config.android && !config.integrity && !config.rtems", "output": [ "privateConfig", { "type": "define", "name": "QT_LARGEFILE_SUPPORT", "value": 64 } @@ -1302,7 +1302,7 @@ }, "dbus": { "label": "Qt D-Bus", - "autoDetect": "!config.uikit && !config.android && !config.winrt", + "autoDetect": "!config.uikit && !config.android", "condition": "features.thread", "output": [ "privateFeature", "feature" ] }, @@ -1628,7 +1628,7 @@ { "type": "feature", "args": "appstore-compliant", - "condition": "config.darwin || config.android || config.winrt || config.win32" + "condition": "config.darwin || config.android || config.win32" } ] }, { -- cgit v1.2.3