Merge remote branch 'qt/master' into lighthouse-master

Conflicts:
	src/opengl/qwindowsurface_gl.cpp

3 files changed, 5 insertions, 3 deletions

diff --git a/src/gui/embedded/qcopchannel_qws.cpp b/src/gui/embedded/qcopchannel_qws.cpp
index 5786866..0d9d9d3 100644
--- a/src/gui/embedded/qcopchannel_qws.cpp
+++ b/src/gui/embedded/qcopchannel_qws.cpp
@@ -502,7 +502,7 @@ void QCopChannel::answer(QWSClient *cl, const QString& ch,
             bool known = qcopServerMap && qcopServerMap->contains(c)
                         && !((*qcopServerMap)[c]).isEmpty();
             // Yes, it's a typo, it's not user-visible, and we choose not to fix it for compatibility
-            QLatin1String ans = QLatin1String(known ? "known" : "unkown");
+            QLatin1String ans = QLatin1String(known ? "known" : "unknown");
             QWSServerPrivate::sendQCopEvent(cl, QLatin1String(""),
                                             ans, data, true);
             return;
diff --git a/src/gui/embedded/qkbd_qws.cpp b/src/gui/embedded/qkbd_qws.cpp
index a325b28..1999ddb 100644
--- a/src/gui/embedded/qkbd_qws.cpp
+++ b/src/gui/embedded/qkbd_qws.cpp
@@ -470,6 +470,8 @@ void QWSKeyboardHandler::endAutoRepeat()
 /*!
     \fn QWSKeyboardHandler::KeycodeAction QWSKeyboardHandler::processKeycode(quint16 keycode, bool isPress, bool autoRepeat)
 
+	\since 4.6
+	
     Maps \a keycode according to a keymap and sends that key event to the
     \l{Qt for Embedded Linux} server application.
 
diff --git a/src/gui/embedded/qtransportauth_qws.cpp b/src/gui/embedded/qtransportauth_qws.cpp
index 9a50702..90e90d1 100644
--- a/src/gui/embedded/qtransportauth_qws.cpp
+++ b/src/gui/embedded/qtransportauth_qws.cpp
@@ -445,7 +445,7 @@ QIODevice *QTransportAuth::passThroughByClient( QWSClient *client ) const
 /*!
   \internal
   Return a QIODevice pointer (to an internal QBuffer) which can be used
-  to receive data after authorisation on transport \a d.
+  to receive data after authorization on transport \a d.
 
   The return QIODevice will act as a pass-through.
 
@@ -468,7 +468,7 @@ QAuthDevice *QTransportAuth::recvBuf( QTransportAuth::Data *data, QIODevice *iod
 
 /*!
   Return a QIODevice pointer (to an internal QBuffer) which can be used
-  to write data onto, for authorisation on transport \a d.
+  to write data onto, for authorization on transport \a d.
 
   The return QIODevice will act as a pass-through.