summaryrefslogtreecommitdiffstats
path: root/src/platformheaders
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-06-04 05:56:06 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-06-04 05:56:06 +0000
commitccad00121d0a9d703cf715c54347b32bfc33bbfc (patch)
tree8e492f00f9ea81d87ae9126ad06c3dbc21fee3a3 /src/platformheaders
parentdc2617f35be61b4827b8e3d192c85e2feacf7f6a (diff)
parente2f66f921594b7be4af4a058c959557489e86879 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/platformheaders')
-rw-r--r--src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc
index 771b56e060..a02f93968d 100644
--- a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc
+++ b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc
@@ -32,7 +32,7 @@
\brief The QXcbWindowFunctions class is an inline class containing
miscellaneous functionality for xcb window specific functionality.
- A commen usage pattern is as follows:
+ A common usage pattern is as follows:
\snippet qxcbwindowfunctions/main.cpp 0
\note There is no binary compatibility guarantee for this class,