diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-26 19:08:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-26 19:08:45 (GMT) |
| commit | f48870f8efbcf7ca4e344e48e4f61334f35b9c6c (patch) | |
| tree | dd0742d8d8f1ac20b78a5142b81a78ad89158b5c /src/plugins/platforms | |
| parent | 58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc (diff) | |
| parent | a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250 (diff) | |
| download | Qt-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')
| -rw-r--r-- | src/plugins/platforms/openkode/qopenkodewindow.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/openkode/qopenkodewindow.cpp b/src/plugins/platforms/openkode/qopenkodewindow.cpp index c6fe6d0..dedd2d5 100644 --- a/src/plugins/platforms/openkode/qopenkodewindow.cpp +++ b/src/plugins/platforms/openkode/qopenkodewindow.cpp @@ -283,7 +283,7 @@ void QOpenKODEWindow::processKeyEvents(const KDEvent *event) QEvent::Type keyPressed = QEvent::KeyRelease; if (event->data.keyboardInputKey.flags) keyPressed = QEvent::KeyPress; -//KD_KEY_LOCATION_LEFT_ATX // dont care for now +//KD_KEY_LOCATION_LEFT_ATX // don't care for now //KD_KEY_LOCATION_RIGHT_ATX //KD_KEY_LOCATION_NUMPAD_ATX Qt::KeyboardModifiers mod = Qt::NoModifier; 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 |