diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:49:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:52:24 +0100 |
| commit | 0c034a649f61019c16aba479fe79d20dde41f2f2 (patch) | |
| tree | 54545862591044b65e618989805945bceb0b3ea5 /src/plugins/platforms/winrt | |
| parent | 2162f01111d21d0ce66ceb8be290b0a13653e691 (diff) | |
| parent | df40b1115db600e8de1c4774476fa30956a34fd9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qpushbutton.cpp
Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81
Diffstat (limited to 'src/plugins/platforms/winrt')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtdrag.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtdrag.cpp b/src/plugins/platforms/winrt/qwinrtdrag.cpp index f23075f5ed..49a0f2c35b 100644 --- a/src/plugins/platforms/winrt/qwinrtdrag.cpp +++ b/src/plugins/platforms/winrt/qwinrtdrag.cpp @@ -504,6 +504,8 @@ static HRESULT qt_drop(IInspectable *sender, ABI::Windows::UI::Xaml::IDragEventA class QtDragEventHandler##name : public IDragEventHandler \ { \ public: \ + virtual ~QtDragEventHandler##name() {\ + }\ STDMETHODIMP Invoke(IInspectable *sender, \ ABI::Windows::UI::Xaml::IDragEventArgs *e) \ { \ diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index d9a9d3b20f..150fc8a25e 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -58,7 +58,7 @@ #include <functional> #include <wrl.h> #include <windows.system.h> -#include <Windows.Applicationmodel.h> +#include <Windows.ApplicationModel.h> #include <Windows.ApplicationModel.core.h> #include <windows.devices.input.h> #include <windows.ui.h> |