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 /src/corelib/kernel/kernel.pri | |
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 'src/corelib/kernel/kernel.pri')
-rw-r--r-- | src/corelib/kernel/kernel.pri | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 76609894ba..fc48ef430e 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -88,27 +88,15 @@ win32 { kernel/qsystemsemaphore_win.cpp HEADERS += \ kernel/qwineventnotifier.h \ - kernel/qwineventnotifier_p.h - - winrt { - SOURCES += kernel/qeventdispatcher_winrt.cpp - HEADERS += kernel/qeventdispatcher_winrt_p.h - } else { - SOURCES += kernel/qeventdispatcher_win.cpp \ - kernel/qwinregistry.cpp - HEADERS += kernel/qeventdispatcher_win_p.h \ - kernel/qwinregistry_p.h - } - - !winrt: LIBS_PRIVATE += -lversion -} + kernel/qwineventnotifier_p.h \ + kernel/qfunctions_winrt_p.h -winrt { - SOURCES += \ - kernel/qfunctions_winrt.cpp - HEADERS += \ - kernel/qfunctions_fake_env_p.h \ - kernel/qfunctions_winrt.h + SOURCES += kernel/qeventdispatcher_win.cpp \ + kernel/qwinregistry.cpp + HEADERS += kernel/qeventdispatcher_win_p.h \ + kernel/qwinregistry_p.h + + LIBS_PRIVATE += -lversion } mac { |