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

iOS: Prepare QIOSIntegration for handling plugin options

Browse Source 
QGuiApplication sets options passed to the plugin through -platform
as properties on the QPlatformNativeInterface. To handle those we need
to inherit QPlatformNativeInterface first (which is the QObject
subclass), and include the Q_OBJECT macro.

Change-Id: Ia496851c64cbb0036c26e7ed0683d0ecfa8319cc
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2015-03-11 14:07:45 +01:00
parent e92b68b1a6
commit d758c115e4
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/ios/qiosintegration.h
View File

@ -45,8 +45,10 @@ QT_BEGIN_NAMESPACE
class QIOSServices; class QIOSServices;
class QIOSIntegration : public QPlatformIntegration, public QPlatformNativeInterface class QIOSIntegration : public QPlatformNativeInterface, public QPlatformIntegration
{ {
Q_OBJECT
public: public:
QIOSIntegration(); QIOSIntegration();
~QIOSIntegration(); ~QIOSIntegration();
@ -72,8 +74,6 @@ public:
QAbstractEventDispatcher *createEventDispatcher() const; QAbstractEventDispatcher *createEventDispatcher() const;
QPlatformNativeInterface *nativeInterface() const; QPlatformNativeInterface *nativeInterface() const;
void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
QTouchDevice *touchDevice(); QTouchDevice *touchDevice();
QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
@ -83,6 +83,10 @@ public:
static QIOSIntegration *instance(); static QIOSIntegration *instance();
// -- QPlatformNativeInterface --
void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
private: private:
QPlatformFontDatabase *m_fontDatabase; QPlatformFontDatabase *m_fontDatabase;
QPlatformClipboard *m_clipboard; QPlatformClipboard *m_clipboard;

26
src/plugins/platforms/ios/qiosintegration.mm
View File

@ -215,11 +215,25 @@ QPlatformTheme *QIOSIntegration::createPlatformTheme(const QString &name) const
return QPlatformIntegration::createPlatformTheme(name); return QPlatformIntegration::createPlatformTheme(name);
} }
QTouchDevice *QIOSIntegration::touchDevice()
{
return m_touchDevice;
}
QPlatformAccessibility *QIOSIntegration::accessibility() const
{
if (!m_accessibility)
m_accessibility = new QIOSPlatformAccessibility;
return m_accessibility;
}
QPlatformNativeInterface *QIOSIntegration::nativeInterface() const QPlatformNativeInterface *QIOSIntegration::nativeInterface() const
{ {
return const_cast<QIOSIntegration *>(this); return const_cast<QIOSIntegration *>(this);
} }
// ---------------------------------------------------------
void *QIOSIntegration::nativeResourceForWindow(const QByteArray &resource, QWindow *window) void *QIOSIntegration::nativeResourceForWindow(const QByteArray &resource, QWindow *window)
{ {
if (!window || !window->handle()) if (!window || !window->handle())
@ -235,16 +249,8 @@ void *QIOSIntegration::nativeResourceForWindow(const QByteArray &resource, QWind
return 0; return 0;
} }
QTouchDevice *QIOSIntegration::touchDevice() // ---------------------------------------------------------
{
return m_touchDevice;
}
QPlatformAccessibility *QIOSIntegration::accessibility() const #include "moc_qiosintegration.cpp"
{
if (!m_accessibility)
m_accessibility = new QIOSPlatformAccessibility;
return m_accessibility;
}
QT_END_NAMESPACE QT_END_NAMESPACE