summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbconnection.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-26 19:08:45 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-26 19:08:45 (GMT)
commitf48870f8efbcf7ca4e344e48e4f61334f35b9c6c (patch)
treedd0742d8d8f1ac20b78a5142b81a78ad89158b5c /src/plugins/platforms/xcb/qxcbconnection.cpp
parent58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc (diff)
parenta7e1ff2b3fc0b5d6cad039f3fe19e31b12089250 (diff)
downloadQt-f48870f8efbcf7ca4e344e48e4f61334f35b9c6c.zip
Qt-f48870f8efbcf7ca4e344e48e4f61334f35b9c6c.tar.gz
Qt-f48870f8efbcf7ca4e344e48e4f61334f35b9c6c.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Doc: Fixing typo
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 80a1624..4f3021e 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -59,7 +59,7 @@
#include <X11/Xlib-xcb.h>
#endif
-#ifdef XCB_USE_EGL //dont pull in eglext prototypes
+#ifdef XCB_USE_EGL //don't pull in eglext prototypes
#include <EGL/egl.h>
#endif