diff options
author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-17 05:14:12 +0900 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-23 01:11:34 +0200 |
commit | 3a14f0301c4cce71a5573c6e5742dc6d00967b6c (patch) | |
tree | 5c21c419d251618ef4bae7cfabd3aec2d1ff0dec | |
parent | 4d238a5684d2e678c309d0ae8ed7f76a5f2bd682 (diff) |
Fix QtGui compilation for -qconfig large
Change-Id: I118a9b40c9eef821b326ee9dabbb9765d65277b7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r-- | src/gui/accessible/qplatformaccessibility_qpa.cpp | 4 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 7 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdrag.h | 3 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdrag_qpa.cpp | 4 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa.h | 2 | ||||
-rw-r--r-- | src/platformsupport/dnd/qsimpledrag.cpp | 4 | ||||
-rw-r--r-- | src/platformsupport/dnd/qsimpledrag_p.h | 4 |
9 files changed, 32 insertions, 0 deletions
diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility_qpa.cpp index 271f324000..36fba10ac4 100644 --- a/src/gui/accessible/qplatformaccessibility_qpa.cpp +++ b/src/gui/accessible/qplatformaccessibility_qpa.cpp @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_ACCESSIBILITY + /* accessiblebridge plugin discovery stuff */ #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, bridgeloader, @@ -136,4 +138,6 @@ void QPlatformAccessibility::cleanup() qDeleteAll(*bridges()); } +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 4e4bc13f12..aa13def646 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -671,6 +671,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform if (!QGuiApplicationPrivate::platform_theme) QGuiApplicationPrivate::platform_theme = new QPlatformTheme; +#ifndef QT_NO_PROPERTIES // Set arguments as dynamic properties on the native interface as // boolean 'foo' or strings: 'foo=bar' if (!arguments.isEmpty()) { @@ -684,6 +685,8 @@ static void init_platform(const QString &pluginArgument, const QString &platform nativeInterface->setProperty(name.constData(), value); } } +#endif + fontSmoothingGamma = QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal(); } @@ -1816,6 +1819,8 @@ void QGuiApplicationPrivate::processExposeEvent(QWindowSystemInterfacePrivate::E QCoreApplication::sendSpontaneousEvent(window, &exposeEvent); } +#ifndef QT_NO_DRAGANDDROP + QPlatformDragQtResponse QGuiApplicationPrivate::processDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions) { static QPointer<QWindow> currentDragWindow; @@ -1874,6 +1879,8 @@ QPlatformDropQtResponse QGuiApplicationPrivate::processDrop(QWindow *w, const QM return response; } +#endif // QT_NO_DRAGANDDROP + #ifndef QT_NO_CLIPBOARD /*! Returns the object for interacting with the clipboard. diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index d40f61d13b..4ea95ee1a9 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -124,8 +124,10 @@ public: static void processFileOpenEvent(QWindowSystemInterfacePrivate::FileOpenEvent *e); +#ifndef QT_NO_DRAGANDDROP static QPlatformDragQtResponse processDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions); static QPlatformDropQtResponse processDrop(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions); +#endif static bool processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result); diff --git a/src/gui/kernel/qplatformdrag.h b/src/gui/kernel/qplatformdrag.h index b74fcbc3a6..10d539b7c2 100644 --- a/src/gui/kernel/qplatformdrag.h +++ b/src/gui/kernel/qplatformdrag.h @@ -58,6 +58,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_NO_DRAGANDDROP class QMimeData; class QMouseEvent; @@ -113,6 +114,8 @@ private: Q_DISABLE_COPY(QPlatformDrag) }; +#endif // QT_NO_DRAGANDDROP + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/gui/kernel/qplatformdrag_qpa.cpp b/src/gui/kernel/qplatformdrag_qpa.cpp index 8367ad8e06..068dfabf7b 100644 --- a/src/gui/kernel/qplatformdrag_qpa.cpp +++ b/src/gui/kernel/qplatformdrag_qpa.cpp @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_DRAGANDDROP + QPlatformDropQtResponse::QPlatformDropQtResponse(bool accepted, Qt::DropAction acceptedAction) : m_accepted(accepted) , m_accepted_action(acceptedAction) @@ -194,4 +196,6 @@ QPixmap QPlatformDrag::defaultPixmap() return *qt_drag_default_pixmap(); } +#endif // QT_NO_DRAGANDDROP + QT_END_NAMESPACE diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp index c011fa4e13..0759b3c08e 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp @@ -497,6 +497,7 @@ int QWindowSystemInterface::windowSystemEventsQueued() return QWindowSystemInterfacePrivate::windowSystemEventsQueued(); } +#ifndef QT_NO_DRAGANDDROP QPlatformDragQtResponse QWindowSystemInterface::handleDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions) { return QGuiApplicationPrivate::processDrag(w, dropData, p,supportedActions); @@ -506,6 +507,7 @@ QPlatformDropQtResponse QWindowSystemInterface::handleDrop(QWindow *w, const QMi { return QGuiApplicationPrivate::processDrop(w, dropData, p,supportedActions); } +#endif // QT_NO_DRAGANDDROP /*! \fn static QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result) diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h index 60db085c4d..41e5a599c7 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.h +++ b/src/gui/kernel/qwindowsysteminterface_qpa.h @@ -133,9 +133,11 @@ public: static void handleExposeEvent(QWindow *tlw, const QRegion ®ion); static void handleSynchronousExposeEvent(QWindow *tlw, const QRegion ®ion); +#ifndef QT_NO_DRAGANDDROP // Drag and drop. These events are sent immediately. static QPlatformDragQtResponse handleDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions); static QPlatformDropQtResponse handleDrop(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions); +#endif static bool handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result); diff --git a/src/platformsupport/dnd/qsimpledrag.cpp b/src/platformsupport/dnd/qsimpledrag.cpp index d3cecd4e44..56ea8a65d8 100644 --- a/src/platformsupport/dnd/qsimpledrag.cpp +++ b/src/platformsupport/dnd/qsimpledrag.cpp @@ -66,6 +66,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_DRAGANDDROP + /*! \class QBasicDrag \brief QBasicDrag is a base class for implementing platform drag and drop. @@ -335,4 +337,6 @@ void QSimpleDrag::drop(const QMouseEvent *me) } } +#endif // QT_NO_DRAGANDDROP + QT_END_NAMESPACE diff --git a/src/platformsupport/dnd/qsimpledrag_p.h b/src/platformsupport/dnd/qsimpledrag_p.h index fa87f09d06..abd465cb6f 100644 --- a/src/platformsupport/dnd/qsimpledrag_p.h +++ b/src/platformsupport/dnd/qsimpledrag_p.h @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE QT_BEGIN_HEADER +#ifndef QT_NO_DRAGANDDROP + class QMouseEvent; class QWindow; class QEventLoop; @@ -116,6 +118,8 @@ private: QWindow *m_current_window; }; +#endif // QT_NO_DRAGANDDROP + QT_END_HEADER QT_END_NAMESPACE |