summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-03-25 11:49:40 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-03-25 11:49:40 (GMT)
commitc648418f82450f12de14b93d007c7564cd77a791 (patch)
tree51c9184ca861783388ef57688984212417b7bb67
parent3b37a79cd94bb0c03d7d8af0f20036ed60a7056f (diff)
downloadQt-c648418f82450f12de14b93d007c7564cd77a791.zip
Qt-c648418f82450f12de14b93d007c7564cd77a791.tar.gz
Qt-c648418f82450f12de14b93d007c7564cd77a791.tar.bz2
Fixed typo.
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h2
-rw-r--r--src/plugins/platforms/xcb/qglxintegration.cpp4
-rw-r--r--src/plugins/platforms/xcb/qglxintegration.h2
-rw-r--r--src/plugins/platforms/xlib/qglxintegration.cpp4
-rw-r--r--src/plugins/platforms/xlib/qglxintegration.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
index 4444229..89ba12b 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
@@ -63,7 +63,7 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, const QPlatformWindo
if (format.useDefaultSharedContext()) {
if (!QPlatformGLContext::defaultSharedContext()) {
if (qt_defaultSharedContextMutex()->tryLock()){
- createDefaultSharedContex(eglDisplay);
+ createDefaultSharedContext(eglDisplay);
qt_defaultSharedContextMutex()->unlock();
} else {
qt_defaultSharedContextMutex()->lock(); //wait to the the shared context is created
@@ -128,7 +128,7 @@ void *QWaylandGLContext::getProcAddress(const QString &string)
return (void *) eglGetProcAddress(string.toLatin1().data());
}
-void QWaylandGLContext::createDefaultSharedContex(EGLDisplay display)
+void QWaylandGLContext::createDefaultSharedContext(EGLDisplay display)
{
QVector<EGLint> eglContextAttrs;
eglContextAttrs.append(EGL_CONTEXT_CLIENT_VERSION);
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
index d530b1c..a3befdc 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
@@ -72,7 +72,7 @@ private:
EGLConfig mConfig;
QPlatformWindowFormat mFormat;
- void createDefaultSharedContex(EGLDisplay eglDisplay);
+ void createDefaultSharedContext(EGLDisplay eglDisplay);
QWaylandGLContext();
};
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp
index e086f91..bce3dfc 100644
--- a/src/plugins/platforms/xcb/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/qglxintegration.cpp
@@ -70,7 +70,7 @@ QGLXContext::QGLXContext(Window window, QXcbScreen *screen, const QPlatformWindo
if (format.useDefaultSharedContext()) {
if (!QPlatformGLContext::defaultSharedContext()) {
if (m_defaultSharedContextMutex.tryLock()){
- createDefaultSharedContex(screen);
+ createDefaultSharedContext(screen);
m_defaultSharedContextMutex.unlock();
} else {
m_defaultSharedContextMutex.lock(); //wait to the the shared context is created
@@ -102,7 +102,7 @@ QGLXContext::~QGLXContext()
glXDestroyContext(DISPLAY_FROM_XCB(m_screen), m_context);
}
-void QGLXContext::createDefaultSharedContex(QXcbScreen *screen)
+void QGLXContext::createDefaultSharedContext(QXcbScreen *screen)
{
int x = 0;
int y = 0;
diff --git a/src/plugins/platforms/xcb/qglxintegration.h b/src/plugins/platforms/xcb/qglxintegration.h
index c65a00a..2e19cf2 100644
--- a/src/plugins/platforms/xcb/qglxintegration.h
+++ b/src/plugins/platforms/xcb/qglxintegration.h
@@ -74,7 +74,7 @@ private:
QGLXContext (QXcbScreen *screen, Drawable drawable, GLXContext context);
static QMutex m_defaultSharedContextMutex;
- static void createDefaultSharedContex(QXcbScreen *xd);
+ static void createDefaultSharedContext(QXcbScreen *xd);
};
#endif
diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp
index 9995f87..6746e22 100644
--- a/src/plugins/platforms/xlib/qglxintegration.cpp
+++ b/src/plugins/platforms/xlib/qglxintegration.cpp
@@ -74,7 +74,7 @@ QGLXContext::QGLXContext(Window window, QXlibScreen *screen, const QPlatformWind
if (format.useDefaultSharedContext()) {
if (!QPlatformGLContext::defaultSharedContext()) {
if (m_defaultSharedContextMutex.tryLock()){
- createDefaultSharedContex(screen);
+ createDefaultSharedContext(screen);
m_defaultSharedContextMutex.unlock();
} else {
m_defaultSharedContextMutex.lock(); //wait to the the shared context is created
@@ -112,7 +112,7 @@ QGLXContext::~QGLXContext()
}
}
-void QGLXContext::createDefaultSharedContex(QXlibScreen *screen)
+void QGLXContext::createDefaultSharedContext(QXlibScreen *screen)
{
int x = 0;
int y = 0;
diff --git a/src/plugins/platforms/xlib/qglxintegration.h b/src/plugins/platforms/xlib/qglxintegration.h
index 8a40527..cf6b006 100644
--- a/src/plugins/platforms/xlib/qglxintegration.h
+++ b/src/plugins/platforms/xlib/qglxintegration.h
@@ -77,7 +77,7 @@ private:
QGLXContext (QXlibScreen *screen, Drawable drawable, GLXContext context);
static QMutex m_defaultSharedContextMutex;
- static void createDefaultSharedContex(QXlibScreen *xd);
+ static void createDefaultSharedContext(QXlibScreen *xd);
};
QT_END_NAMESPACE