1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make qtbase compile with QT_NO_DRAGANDDROP

Browse Source 
Change-Id: Ief16e435af6e6d246b84505a1c1208994c7b0b38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
This commit is contained in:
Tasuku Suzuki 2012-06-20 10:29:04 +09:00 committed by Qt by Nokia
parent 7590ca03ce
commit d2e83f3056
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/kernel/qdnd_p.h
View File

@ -69,7 +69,7 @@ class QEventLoop;
class QMouseEvent; class QMouseEvent;
class QPlatformDrag; class QPlatformDrag;
#ifndef QT_NO_DRAGANDDROP #if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
class Q_GUI_EXPORT QInternalMimeData : public QMimeData class Q_GUI_EXPORT QInternalMimeData : public QMimeData
{ {
@ -95,6 +95,10 @@ protected:
virtual QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const = 0; virtual QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const = 0;
}; };
#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
#ifndef QT_NO_DRAGANDDROP
class QDragPrivate : public QObjectPrivate class QDragPrivate : public QObjectPrivate
{ {
public: public:

4
src/plugins/platforms/xcb/qxcbmime.cpp
View File

@ -54,7 +54,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_DRAGANDDROP #if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
QXcbMime::QXcbMime() QXcbMime::QXcbMime()
: QInternalMimeData() : QInternalMimeData()
@ -291,6 +291,6 @@ xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString
return 0; return 0;
} }
#endif // QT_NO_DRAGANDDROP #endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
QT_END_NAMESPACE QT_END_NAMESPACE

5
src/plugins/platforms/xcb/qxcbmime.h
View File

@ -51,7 +51,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_DRAGANDDROP #if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
class QXcbMime : public QInternalMimeData { class QXcbMime : public QInternalMimeData {
Q_OBJECT Q_OBJECT
@ -69,7 +69,8 @@ public:
const QList<xcb_atom_t> &atoms, QByteArray *requestedEncoding); const QList<xcb_atom_t> &atoms, QByteArray *requestedEncoding);
}; };
#endif // QT_NO_DRAGANDDROP #endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
QT_END_NAMESPACE QT_END_NAMESPACE