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/xcb/qxcbmime.cpp | |
| 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/xcb/qxcbmime.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbmime.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp index 58e2e8c0e6..7170d259fd 100644 --- a/src/plugins/platforms/xcb/qxcbmime.cpp +++ b/src/plugins/platforms/xcb/qxcbmime.cpp @@ -46,8 +46,6 @@ QT_BEGIN_NAMESPACE -#if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) - QXcbMime::QXcbMime() : QInternalMimeData() { } @@ -320,6 +318,4 @@ xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString return 0; } -#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) - QT_END_NAMESPACE |