Merge remote-tracking branch 'origin/stable' into dev

Manually changed enum to LibGL in
    src/plugins/platforms/xcb/qglxintegration.cpp

Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207

2 files changed, 11 insertions, 0 deletions

diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp
index b4021c060f..0fa1f02f5c 100644
--- a/src/corelib/io/qfileselector.cpp
+++ b/src/corelib/io/qfileselector.cpp
@@ -365,6 +365,11 @@ QStringList QFileSelectorPrivate::platformSelectors()
     ret << QStringLiteral("windows");
 #  if defined(Q_OS_WINCE)
     ret << QStringLiteral("wince");
+#  elif defined(Q_OS_WINRT)
+    ret << QStringLiteral("winrt");
+#    if defined(Q_OS_WINPHONE)
+    ret << QStringLiteral("winphone");
+#    endif
 #  endif
 #elif defined(Q_OS_UNIX)
     ret << QStringLiteral("unix");
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp
index 08ecd67dc8..518052e537 100644
--- a/src/corelib/io/qloggingcategory.cpp
+++ b/src/corelib/io/qloggingcategory.cpp
@@ -62,6 +62,12 @@ Q_GLOBAL_STATIC_WITH_ARGS(QLoggingCategory, qtDefaultCategory,
     by a string - at runtime. Whether a category should be actually logged or
     not can be checked with the \l isEnabled() methods.
 
+    All objects are meant to be configured by a common registry (see also
+    \l{Configuring Categories}). Different objects can also represent the same
+    category. It's therefore not recommended to export objects across module
+    boundaries, nor to manipulate the objects directly, nor to inherit from
+    QLoggingCategory.
+
     \section1 Creating category objects
 
     The Q_LOGGING_CATEGORY() and the Q_DECLARE_LOGGING_CATEGORY() macros