Fix QtGui compilation for -qconfig large
Change-Id: I118a9b40c9eef821b326ee9dabbb9765d65277b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
parent
4d238a5684
commit
3a14f0301c
@ -49,6 +49,8 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
#ifndef QT_NO_ACCESSIBILITY
|
||||||
|
|
||||||
/* accessiblebridge plugin discovery stuff */
|
/* accessiblebridge plugin discovery stuff */
|
||||||
#ifndef QT_NO_LIBRARY
|
#ifndef QT_NO_LIBRARY
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, bridgeloader,
|
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, bridgeloader,
|
||||||
@ -136,4 +138,6 @@ void QPlatformAccessibility::cleanup()
|
|||||||
qDeleteAll(*bridges());
|
qDeleteAll(*bridges());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // QT_NO_ACCESSIBILITY
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
@ -671,6 +671,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform
|
|||||||
if (!QGuiApplicationPrivate::platform_theme)
|
if (!QGuiApplicationPrivate::platform_theme)
|
||||||
QGuiApplicationPrivate::platform_theme = new QPlatformTheme;
|
QGuiApplicationPrivate::platform_theme = new QPlatformTheme;
|
||||||
|
|
||||||
|
#ifndef QT_NO_PROPERTIES
|
||||||
// Set arguments as dynamic properties on the native interface as
|
// Set arguments as dynamic properties on the native interface as
|
||||||
// boolean 'foo' or strings: 'foo=bar'
|
// boolean 'foo' or strings: 'foo=bar'
|
||||||
if (!arguments.isEmpty()) {
|
if (!arguments.isEmpty()) {
|
||||||
@ -684,6 +685,8 @@ static void init_platform(const QString &pluginArgument, const QString &platform
|
|||||||
nativeInterface->setProperty(name.constData(), value);
|
nativeInterface->setProperty(name.constData(), value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
fontSmoothingGamma = QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal();
|
fontSmoothingGamma = QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1816,6 +1819,8 @@ void QGuiApplicationPrivate::processExposeEvent(QWindowSystemInterfacePrivate::E
|
|||||||
QCoreApplication::sendSpontaneousEvent(window, &exposeEvent);
|
QCoreApplication::sendSpontaneousEvent(window, &exposeEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
QPlatformDragQtResponse QGuiApplicationPrivate::processDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions)
|
QPlatformDragQtResponse QGuiApplicationPrivate::processDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions)
|
||||||
{
|
{
|
||||||
static QPointer<QWindow> currentDragWindow;
|
static QPointer<QWindow> currentDragWindow;
|
||||||
@ -1874,6 +1879,8 @@ QPlatformDropQtResponse QGuiApplicationPrivate::processDrop(QWindow *w, const QM
|
|||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
#ifndef QT_NO_CLIPBOARD
|
#ifndef QT_NO_CLIPBOARD
|
||||||
/*!
|
/*!
|
||||||
Returns the object for interacting with the clipboard.
|
Returns the object for interacting with the clipboard.
|
||||||
|
@ -124,8 +124,10 @@ public:
|
|||||||
|
|
||||||
static void processFileOpenEvent(QWindowSystemInterfacePrivate::FileOpenEvent *e);
|
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 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);
|
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);
|
static bool processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result);
|
||||||
|
|
||||||
|
@ -58,6 +58,7 @@ QT_BEGIN_HEADER
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
#ifndef QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
class QMimeData;
|
class QMimeData;
|
||||||
class QMouseEvent;
|
class QMouseEvent;
|
||||||
@ -113,6 +114,8 @@ private:
|
|||||||
Q_DISABLE_COPY(QPlatformDrag)
|
Q_DISABLE_COPY(QPlatformDrag)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif // QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
@ -48,6 +48,8 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
#ifndef QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
QPlatformDropQtResponse::QPlatformDropQtResponse(bool accepted, Qt::DropAction acceptedAction)
|
QPlatformDropQtResponse::QPlatformDropQtResponse(bool accepted, Qt::DropAction acceptedAction)
|
||||||
: m_accepted(accepted)
|
: m_accepted(accepted)
|
||||||
, m_accepted_action(acceptedAction)
|
, m_accepted_action(acceptedAction)
|
||||||
@ -194,4 +196,6 @@ QPixmap QPlatformDrag::defaultPixmap()
|
|||||||
return *qt_drag_default_pixmap();
|
return *qt_drag_default_pixmap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
@ -497,6 +497,7 @@ int QWindowSystemInterface::windowSystemEventsQueued()
|
|||||||
return QWindowSystemInterfacePrivate::windowSystemEventsQueued();
|
return QWindowSystemInterfacePrivate::windowSystemEventsQueued();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef QT_NO_DRAGANDDROP
|
||||||
QPlatformDragQtResponse QWindowSystemInterface::handleDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions)
|
QPlatformDragQtResponse QWindowSystemInterface::handleDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions)
|
||||||
{
|
{
|
||||||
return QGuiApplicationPrivate::processDrag(w, dropData, p,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);
|
return QGuiApplicationPrivate::processDrop(w, dropData, p,supportedActions);
|
||||||
}
|
}
|
||||||
|
#endif // QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\fn static QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result)
|
\fn static QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result)
|
||||||
|
@ -133,9 +133,11 @@ public:
|
|||||||
static void handleExposeEvent(QWindow *tlw, const QRegion ®ion);
|
static void handleExposeEvent(QWindow *tlw, const QRegion ®ion);
|
||||||
static void handleSynchronousExposeEvent(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.
|
// Drag and drop. These events are sent immediately.
|
||||||
static QPlatformDragQtResponse handleDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions);
|
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);
|
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);
|
static bool handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result);
|
||||||
|
|
||||||
|
@ -66,6 +66,8 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
#ifndef QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QBasicDrag
|
\class QBasicDrag
|
||||||
\brief QBasicDrag is a base class for implementing platform drag and drop.
|
\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
|
QT_END_NAMESPACE
|
||||||
|
@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE
|
|||||||
|
|
||||||
QT_BEGIN_HEADER
|
QT_BEGIN_HEADER
|
||||||
|
|
||||||
|
#ifndef QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
class QMouseEvent;
|
class QMouseEvent;
|
||||||
class QWindow;
|
class QWindow;
|
||||||
class QEventLoop;
|
class QEventLoop;
|
||||||
@ -116,6 +118,8 @@ private:
|
|||||||
QWindow *m_current_window;
|
QWindow *m_current_window;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif // QT_NO_DRAGANDDROP
|
||||||
|
|
||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
Loading…
Reference in New Issue
Block a user