Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

7 files changed, 19 insertions, 13 deletions

diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index c8eb15a7f7..c9c8f1da54 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -26,7 +26,8 @@ qhp.QtCore.subprojects.classes.sortPages = true
 
 tagfile                 = ../../../doc/qtcore/qtcore.tags
 
-depends                 += activeqt qtdbus qtgui qtwidgets qtnetwork qtdoc qtmacextras qtqml qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake
+depends                 += activeqt qtdbus qtgui qtwidgets qtnetwork qtdoc qtmacextras qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake
+# depends               += qtqml # Qt namespace collides with QtQml::Qt, see QTBUG-38630
 
 headerdirs  += ..
 
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
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 2e0f781822..d5aed60972 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -325,6 +325,7 @@ private:
     friend class QGraphicsViewPrivate;
     friend class QGraphicsScene;
     friend class QGraphicsScenePrivate;
+    friend class QWidgetWindow;
 #ifndef QT_NO_GESTURES
     friend class QGestureManager;
 #endif
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 3c9cc9ee28..9c61a67962 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -777,6 +777,7 @@ struct VariantData
     const void *data;
     const uint flags;
 private:
+    // copy constructor allowed to be implicit to silence level 4 warning from MSVC
     VariantData &operator=(const VariantData &) Q_DECL_EQ_DELETE;
 };
 
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index 407a6a4e02..cde42c4f6e 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -125,11 +125,9 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
   or writing to the shared memory, and remember to release the lock
   with unlock() after you are done.
 
-  Unlike QtSharedMemory, QSharedMemory automatically destroys the
-  shared memory segment when the last instance of QSharedMemory is
-  detached from the segment, and no references to the segment
-  remain. Do not mix using QtSharedMemory and QSharedMemory. Port
-  everything to QSharedMemory.
+  QSharedMemory automatically destroys the shared memory segment when
+  the last instance of QSharedMemory is detached from the segment, and
+  no references to the segment remain.
 
   \warning QSharedMemory changes the key in a Qt-specific way, unless otherwise
   specified. Interoperation with non-Qt applications is achieved by first creating
diff --git a/src/corelib/tools/qtimezoneprivate_mac.mm b/src/corelib/tools/qtimezoneprivate_mac.mm
index 49930490ff..7985b78712 100644
--- a/src/corelib/tools/qtimezoneprivate_mac.mm
+++ b/src/corelib/tools/qtimezoneprivate_mac.mm
@@ -89,7 +89,7 @@ QTimeZonePrivate *QMacTimeZonePrivate::clone()
 void QMacTimeZonePrivate::init(const QByteArray &ianaId)
 {
     if (availableTimeZoneIds().contains(ianaId)) {
-        m_nstz = [NSTimeZone timeZoneWithName:QCFString::toNSString(QString::fromUtf8(ianaId))];
+        m_nstz = [[NSTimeZone timeZoneWithName:QCFString::toNSString(QString::fromUtf8(ianaId))] retain];
         if (m_nstz)
             m_id = ianaId;
     }
@@ -142,7 +142,6 @@ QString QMacTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
     NSString *macLocaleCode = QCFString::toNSString(locale.name());
     NSLocale *macLocale = [[NSLocale alloc] initWithLocaleIdentifier:macLocaleCode];
     const QString result = QCFString::toQString([m_nstz localizedName:style locale:macLocale]);
-    [macLocaleCode release];
     [macLocale release];
     return result;
 }
@@ -192,7 +191,6 @@ QTimeZonePrivate::Data QMacTimeZonePrivate::data(qint64 forMSecsSinceEpoch) cons
     data.daylightTimeOffset = [m_nstz daylightSavingTimeOffsetForDate:date];
     data.standardTimeOffset = data.offsetFromUtc - data.daylightTimeOffset;
     data.abbreviation = QCFString::toQString([m_nstz abbreviationForDate:date]);
-    [date release];
     return data;
 }
 
@@ -203,8 +201,6 @@ bool QMacTimeZonePrivate::hasTransitions() const
     NSDate *epoch = [NSDate dateWithTimeIntervalSince1970:0];
     const NSDate *date = [m_nstz nextDaylightSavingTimeTransitionAfterDate:epoch];
     const bool result = ([date timeIntervalSince1970] > [epoch timeIntervalSince1970]);
-    [epoch release];
-    [date release];
     return result;
 }
 
@@ -224,7 +220,6 @@ QTimeZonePrivate::Data QMacTimeZonePrivate::nextTransition(qint64 afterMSecsSinc
     tran.daylightTimeOffset = [m_nstz daylightSavingTimeOffsetForDate:nextDate];
     tran.standardTimeOffset = tran.offsetFromUtc - tran.daylightTimeOffset;
     tran.abbreviation = QCFString::toQString([m_nstz abbreviationForDate:nextDate]);
-    [nextDate release];
     return tran;
 }
 
@@ -246,7 +241,6 @@ QTimeZonePrivate::Data QMacTimeZonePrivate::previousTransition(qint64 beforeMSec
             nextDate = [m_nstz nextDaylightSavingTimeTransitionAfterDate:nextDate];
             nextSecs = [nextDate timeIntervalSince1970];
         }
-        [nextDate release];
     }
     if (secsList.size() >= 1)
         return data(qint64(secsList.last()) * 1000);