diff options
author | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
commit | 096e37910d93f9c52976600e985c615ea36fe291 (patch) | |
tree | 713d020f4a04f03d8ca6e111055e7eebe85953a8 /src/plugins/platforms/winrt | |
parent | 88eda007a3b5046999dd0b287634765efcd8934d (diff) | |
parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/kernel/qeventdispatcher_cf.mm
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/qioseventdispatcher.mm
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsinternalmimedata.h
src/plugins/platforms/windows/qwindowsmime.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
Diffstat (limited to 'src/plugins/platforms/winrt')
-rw-r--r-- | src/plugins/platforms/winrt/qwinrtdrag.h | 3 | ||||
-rw-r--r-- | src/plugins/platforms/winrt/qwinrtintegration.cpp | 6 | ||||
-rw-r--r-- | src/plugins/platforms/winrt/qwinrtintegration.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 8 | ||||
-rw-r--r-- | src/plugins/platforms/winrt/winrt.pro | 8 |
5 files changed, 13 insertions, 14 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtdrag.h b/src/plugins/platforms/winrt/qwinrtdrag.h index 2371201507..3868c9f015 100644 --- a/src/plugins/platforms/winrt/qwinrtdrag.h +++ b/src/plugins/platforms/winrt/qwinrtdrag.h @@ -41,7 +41,8 @@ #include <QtCore/QLoggingCategory> #include <QtCore/QMimeData> -#include <QtGui/private/qdnd_p.h> // QInternalMime +#include <QtGui/private/qdnd_p.h> +#include <QtGui/private/qinternalmimedata_p.h> #include <wrl.h> diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp index eae043f3a7..4f37583bed 100644 --- a/src/plugins/platforms/winrt/qwinrtintegration.cpp +++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp @@ -47,7 +47,7 @@ #include "qwinrteglcontext.h" #include "qwinrttheme.h" #include "qwinrtclipboard.h" -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) #include "qwinrtdrag.h" #endif #if QT_CONFIG(accessibility) @@ -317,12 +317,12 @@ QPlatformClipboard *QWinRTIntegration::clipboard() const return d->clipboard; } -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QPlatformDrag *QWinRTIntegration::drag() const { return QWinRTDrag::instance(); } -#endif // QT_NO_DRAGANDDROP +#endif // QT_CONFIG(draganddrop) #if QT_CONFIG(accessibility) QPlatformAccessibility *QWinRTIntegration::accessibility() const diff --git a/src/plugins/platforms/winrt/qwinrtintegration.h b/src/plugins/platforms/winrt/qwinrtintegration.h index adc7620727..7c83e27c26 100644 --- a/src/plugins/platforms/winrt/qwinrtintegration.h +++ b/src/plugins/platforms/winrt/qwinrtintegration.h @@ -97,7 +97,7 @@ public: QPlatformInputContext *inputContext() const override; QPlatformServices *services() const override; QPlatformClipboard *clipboard() const override; -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QPlatformDrag *drag() const override; #endif #if QT_CONFIG(accessibility) diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index a60d50bcc1..7e71b6faf1 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -42,7 +42,7 @@ #include "qwinrtbackingstore.h" #include "qwinrtinputcontext.h" #include "qwinrtcursor.h" -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) #include "qwinrtdrag.h" #endif #include "qwinrtwindow.h" @@ -568,7 +568,7 @@ QWinRTScreen::QWinRTScreen() hr = d->canvas.As(&uiElement); Q_ASSERT_SUCCEEDED(hr); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QWinRTDrag::instance()->setUiElement(uiElement); #endif hr = window->put_Content(uiElement.Get()); @@ -852,7 +852,7 @@ void QWinRTScreen::addWindow(QWindow *window) handleExpose(); QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QWinRTDrag::instance()->setDropTarget(window); #endif } @@ -872,7 +872,7 @@ void QWinRTScreen::removeWindow(QWindow *window) if (wasTopWindow && type != Qt::Popup && type != Qt::ToolTip && type != Qt::Tool) QWindowSystemInterface::handleWindowActivated(nullptr, Qt::OtherFocusReason); QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) if (wasTopWindow) QWinRTDrag::instance()->setDropTarget(topWindow()); #endif diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro index 167c5b0448..6a847465e4 100644 --- a/src/plugins/platforms/winrt/winrt.pro +++ b/src/plugins/platforms/winrt/winrt.pro @@ -16,7 +16,6 @@ SOURCES = \ qwinrtcanvas.cpp \ qwinrtclipboard.cpp \ qwinrtcursor.cpp \ - qwinrtdrag.cpp \ qwinrteglcontext.cpp \ qwinrteventdispatcher.cpp \ qwinrtfiledialoghelper.cpp \ @@ -35,7 +34,6 @@ HEADERS = \ qwinrtcanvas.h \ qwinrtclipboard.h \ qwinrtcursor.h \ - qwinrtdrag.h \ qwinrteglcontext.h \ qwinrteventdispatcher.h \ qwinrtfiledialoghelper.h \ @@ -55,9 +53,9 @@ WINRT_SDK_VERSION = $$member($$list($$split(WINRT_SDK_VERSION_STRING, .)), 2) lessThan(WINRT_SDK_VERSION, 14322): DEFINES += QT_WINRT_LIMITED_DRAGANDDROP greaterThan(WINRT_SDK_VERSION, 14393): DEFINES += QT_WINRT_DISABLE_PHONE_COLORS -contains(DEFINES, QT_NO_DRAGANDDROP) { - SOURCES -= qwinrtdrag.cpp - HEADERS -= qwinrtdrag.h +qtConfig(draganddrop) { + SOURCES += qwinrtdrag.cpp + HEADERS += qwinrtdrag.h } qtConfig(accessibility): include($$PWD/uiautomation/uiautomation.pri) |