diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:27:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-13 16:08:01 +0200 |
| commit | ff334fd57414be90ab6b40f91e16f0bdb1835762 (patch) | |
| tree | bb74d8217781394163870cb3399f0984136498c8 /src/corelib/io | |
| parent | ec4c93a852ddc1d1437232241de492ad20d4cbb1 (diff) | |
| parent | b5552bab40f2e165cf7196993ffc83785f4d8264 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfileselector.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/io/qloggingcategory.cpp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index fbf3b31291..4301536cf7 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -362,6 +362,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 |