5 files changed, 13 insertions, 10 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 283209d08f..6667cae237 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -68,7 +68,7 @@ class QTextCursor;
 class Q_GUI_EXPORT QAccessible
 {
     Q_GADGET
-    Q_ENUMS(Role Event State)
+    Q_ENUMS(Role Event)
 public:
 
     enum Event {
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index ccbfd36b70..664ff9eaf4 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -100,10 +100,6 @@ QAccessibleObject::~QAccessibleObject()
 */
 QObject *QAccessibleObject::object() const
 {
-#ifndef QT_NO_DEBUG
-    if (!d->object)
-        qWarning("QAccessibleInterface is invalid. Crash pending...");
-#endif
     return d->object;
 }
 
diff --git a/src/gui/doc/images/icon.png b/src/gui/doc/images/icon.png
new file mode 100644
index 0000000000..cc2b6ac93a
--- /dev/null
+++ b/src/gui/doc/images/icon.png
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 062f00c4c4..b44f563b3e 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -8,6 +8,10 @@ DEFINES   += QT_NO_USING_NAMESPACE
 
 QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf
 
+MODULE_PLUGIN_TYPES = \
+    platforms \
+    imageformats
+
 load(qt_module)
 
 # Code coverage with TestCocoon
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index c5be379b7d..ba97db4d39 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -947,11 +947,14 @@ QKeyEvent::~QKeyEvent()
 /*!
     \fn QString QKeyEvent::text() const
 
-    Returns the Unicode text that this key generated. The text
-    returned can be an empty string in cases
-    where modifier keys, such as Shift, Control, Alt, and Meta,
-    are being pressed or released. In such cases key() will contain
-    a valid value.
+    Returns the Unicode text that this key generated.
+
+    Return values when modifier keys such as
+    Shift, Control, Alt, and Meta are pressed
+    differ among platforms and could return an empty string.
+
+    \note \l key() will always return a valid value,
+    independent of modifier keys.
 
     \sa Qt::WA_KeyCompression
 */