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.cmake | |
parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) | |
download | qtbase-45b0f1be686cfba8dcecb9be5c875cae59c69276.tar.gz |
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.cmake')
-rw-r--r-- | configure.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.cmake b/configure.cmake index b1ff2ba5b2..fa20b94333 100644 --- a/configure.cmake +++ b/configure.cmake @@ -419,7 +419,7 @@ qt_feature_config("separate_debug_info" QMAKE_PUBLIC_QT_CONFIG) qt_feature("appstore-compliant" PUBLIC LABEL "App store compliance" PURPOSE "Disables code that is not allowed in platform app stores" - AUTODETECT UIKIT OR ANDROID OR WINRT + AUTODETECT UIKIT OR ANDROID ) qt_feature("simulator_and_device" PUBLIC LABEL "Build for both simulator and device" @@ -455,7 +455,7 @@ qt_feature_config("framework" QMAKE_PUBLIC_CONFIG ) qt_feature("largefile" LABEL "Large file support" - CONDITION NOT ANDROID AND NOT INTEGRITY AND NOT WINRT AND NOT rtems + CONDITION NOT ANDROID AND NOT INTEGRITY AND NOT rtems ) qt_feature_definition("largefile" "QT_LARGEFILE_SUPPORT" VALUE "64") qt_feature_config("largefile" QMAKE_PRIVATE_CONFIG) @@ -756,7 +756,7 @@ qt_feature("concurrent" PUBLIC qt_feature_definition("concurrent" "QT_NO_CONCURRENT" NEGATE VALUE "1") qt_feature("dbus" PUBLIC PRIVATE LABEL "Qt D-Bus" - AUTODETECT NOT UIKIT AND NOT ANDROID AND NOT WINRT + AUTODETECT NOT UIKIT AND NOT ANDROID CONDITION QT_FEATURE_thread ) qt_feature_definition("dbus" "QT_NO_DBUS" NEGATE VALUE "1") @@ -930,7 +930,7 @@ qt_configure_add_summary_entry( qt_configure_add_summary_build_parts("Build parts") qt_configure_add_summary_entry( ARGS "appstore-compliant" - CONDITION APPLE OR ANDROID OR WINRT OR WIN32 + CONDITION APPLE OR ANDROID OR WIN32 ) qt_configure_end_summary_section() # end of "Build options" section qt_configure_add_summary_section(NAME "Qt modules and options") |