diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
tree | 363dfd46575d147206267d854ce14747157f432e /configure.json | |
parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) |
Remove winrt
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ø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r-- | configure.json | 8 |
1 files changed, 4 insertions, 4 deletions
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" } ] }, { |