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/widgets/kernel/qwidget_p.h | |
| 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/widgets/kernel/qwidget_p.h')
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index fae9e5ff4e..20c4a682ed 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -268,7 +268,7 @@ struct QWExtra { // *************************** Platform specific values (bit fields first) ********** #if 0 /* Used to be included in Qt4 for Q_WS_WIN */ // <----------------------------------------------------------- WIN -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QOleDropTarget *dropTarget; // drop target QList<QPointer<QWidget> > oleDropWidgets; #endif @@ -800,7 +800,7 @@ public: bool shouldShowMaximizeButton(); void winUpdateIsOpaque(); void reparentChildren(); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QOleDropTarget *registerOleDnd(QWidget *widget); void unregisterOleDnd(QWidget *widget, QOleDropTarget *target); #endif |