diff options
Diffstat (limited to 'src/gui/platform')
4 files changed, 5 insertions, 10 deletions
diff --git a/src/gui/platform/android/qandroidnativeinterface.cpp b/src/gui/platform/android/qandroidnativeinterface.cpp index b1063034a0..20c378a9e9 100644 --- a/src/gui/platform/android/qandroidnativeinterface.cpp +++ b/src/gui/platform/android/qandroidnativeinterface.cpp @@ -60,7 +60,7 @@ using namespace QNativeInterface::Private; \ingroup native-interfaces-qoffscreensurface */ -QT_DEFINE_NATIVE_INTERFACE(QAndroidOffscreenSurface, QOffscreenSurface); +QT_DEFINE_NATIVE_INTERFACE(QAndroidOffscreenSurface); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QAndroidOffScreenIntegration); QOffscreenSurface *QNativeInterface::QAndroidOffscreenSurface::fromNative(ANativeWindow *nativeSurface) diff --git a/src/gui/platform/macos/qcocoanativeinterface.mm b/src/gui/platform/macos/qcocoanativeinterface.mm index ef8d091e47..e1f3c73e5e 100644 --- a/src/gui/platform/macos/qcocoanativeinterface.mm +++ b/src/gui/platform/macos/qcocoanativeinterface.mm @@ -104,7 +104,7 @@ QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaMenuBar); \return the underlying NSOpenGLContext. */ -QT_DEFINE_NATIVE_INTERFACE(QCocoaGLContext, QOpenGLContext); +QT_DEFINE_NATIVE_INTERFACE(QCocoaGLContext); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaGLIntegration); QOpenGLContext *QNativeInterface::QCocoaGLContext::fromNative(NSOpenGLContext *nativeContext, QOpenGLContext *shareContext) diff --git a/src/gui/platform/unix/qunixnativeinterface.cpp b/src/gui/platform/unix/qunixnativeinterface.cpp index 0ef88b4c91..9fde98f76a 100644 --- a/src/gui/platform/unix/qunixnativeinterface.cpp +++ b/src/gui/platform/unix/qunixnativeinterface.cpp @@ -96,7 +96,7 @@ using namespace QNativeInterface::Private; \return the underlying GLXContext. */ -QT_DEFINE_NATIVE_INTERFACE(QGLXContext, QOpenGLContext); +QT_DEFINE_NATIVE_INTERFACE(QGLXContext); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QGLXIntegration); QOpenGLContext *QNativeInterface::QGLXContext::fromNative(GLXContext configBasedContext, QOpenGLContext *shareContext) @@ -143,7 +143,7 @@ QOpenGLContext *QNativeInterface::QGLXContext::fromNative(GLXContext visualBased \return the underlying EGLContext. */ -QT_DEFINE_NATIVE_INTERFACE(QEGLContext, QOpenGLContext); +QT_DEFINE_NATIVE_INTERFACE(QEGLContext); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QEGLIntegration); QOpenGLContext *QNativeInterface::QEGLContext::fromNative(EGLContext context, EGLDisplay display, QOpenGLContext *shareContext) @@ -198,11 +198,6 @@ QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QVsp2Screen); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QEvdevKeyMapper); -template <> -QEvdevKeyMapper *QKeyMapper::nativeInterface<QEvdevKeyMapper>() const -{ - return dynamic_cast<QEvdevKeyMapper*>(QGuiApplicationPrivate::platformIntegration()); -} #endif // QT_CONFIG(evdev) QT_END_NAMESPACE diff --git a/src/gui/platform/windows/qwindowsnativeinterface.cpp b/src/gui/platform/windows/qwindowsnativeinterface.cpp index 850713db2c..4a7d0fd2c9 100644 --- a/src/gui/platform/windows/qwindowsnativeinterface.cpp +++ b/src/gui/platform/windows/qwindowsnativeinterface.cpp @@ -95,7 +95,7 @@ using namespace QNativeInterface::Private; \note This function requires that the QGuiApplication instance is already created. */ -QT_DEFINE_NATIVE_INTERFACE(QWGLContext, QOpenGLContext); +QT_DEFINE_NATIVE_INTERFACE(QWGLContext); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QWindowsGLIntegration); HMODULE QNativeInterface::QWGLContext::openGLModuleHandle() |