diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:42:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:44:18 +0200 |
| commit | d8fc0da235b2bd566b2b6f1e21218afdf2f34eb3 (patch) | |
| tree | c0ca819521ed6901a83ab476fa822a886691d806 /src/corelib/tools/qtimezone.cpp | |
| parent | 3649a6e61d823289d18be19387d7e3923dd90bd0 (diff) | |
| parent | cdf0c5905b3477c6cd01c519f883b7bb55447120 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
Change-Id: Ica85deeab5c5038ac004718e25194b1157343480
Diffstat (limited to 'src/corelib/tools/qtimezone.cpp')
| -rw-r--r-- | src/corelib/tools/qtimezone.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index 890798b421..860ad180f1 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -425,6 +425,15 @@ QTimeZone &QTimeZone::operator=(const QTimeZone &other) } /*! + \fn QTimeZone &QTimeZone::operator=(QTimeZone &&other) + + Move-assigns \a other to this QTimeZone instance, transferring the + ownership of the managed pointer to this instance. + + \since 5.2 +*/ + +/*! Returns true if this time zone is equal to the \a other time zone. */ |