Merge remote branch 'gerrit/master' into refactor

Conflicts:
	examples/opengl/cube/main.cpp
	examples/widgets/applicationicon/main.cpp
	examples/widgets/orientation/main.cpp
	src/gui/image/qicon.cpp
	src/gui/image/qimage.h
	src/gui/image/qpixmap.h
	src/gui/image/qpixmap_mac.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qpalette.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/styles/qmacstyle_mac.mm
	src/gui/widgets/qmenubar.cpp
	src/gui/widgets/qslider.cpp
	src/opengl/qwindowsurface_gl.cpp
	tests/auto/qvariant/qvariant.pro
	tests/benchmarks/corelib/kernel/qobject/qobject.pro
	tests/benchmarks/gui/animation/qanimation/qanimation.pro
	tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
	tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
	tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
	tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
	tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
	tests/benchmarks/gui/image/qimagereader/qimagereader.pro
	tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
	tests/benchmarks/gui/kernel/qapplication/qapplication.pro
	tests/benchmarks/gui/kernel/qwidget/qwidget.pro
	tests/benchmarks/gui/painting/qpainter/qpainter.pro
	tests/benchmarks/gui/painting/qtbench/qtbench.pro
	tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
	tests/benchmarks/gui/text/qtext/qtext.pro

Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30

1 files changed, 0 insertions, 68 deletions

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 39141b7c00..3d3bc55d71 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -3710,74 +3710,6 @@ QDataStream &operator>>(QDataStream &in, QDateTime &dateTime)
 #endif // QT_NO_DATASTREAM
 
 
-/*!
-    \fn QString QDate::monthName(int month)
-
-    Use shortMonthName() instead.
-*/
-
-/*!
-    \fn QString QDate::dayName(int weekday)
-
-    Use shortDayName() instead.
-*/
-
-/*!
-    \fn bool QDate::leapYear(int year)
-
-    Use isLeapYear() instead.
-*/
-
-/*!
-    \fn QDate QDate::currentDate(Qt::TimeSpec spec)
-
-    If \a spec is Qt::LocalTime, use the currentDate() overload that
-    takes no parameters instead; otherwise, use
-    QDateTime::currentDateTime().
-
-    \oldcode
-        QDate localDate = QDate::currentDate(Qt::LocalTime);
-        QDate utcDate = QDate::currentDate(Qt::UTC);
-    \newcode
-        QDate localDate = QDate::currentDate();
-        QDate utcDate = QDateTime::currentDateTime().toUTC().date();
-    \endcode
-
-    \sa QDateTime::toUTC()
-*/
-
-/*!
-    \fn QTime QTime::currentTime(Qt::TimeSpec specification)
-
-    Returns the current time for the given \a specification.
-
-    To replace uses of this function where the \a specification is Qt::LocalTime,
-    use the currentDate() overload that takes no parameters instead; otherwise,
-    use QDateTime::currentDateTime() and convert the result to a UTC measurement.
-
-    \oldcode
-        QTime localTime = QTime::currentTime(Qt::LocalTime);
-        QTime utcTime = QTime::currentTime(Qt::UTC);
-    \newcode
-        QTime localTime = QTime::currentTime();
-        QTime utcTime = QTimeTime::currentDateTime().toUTC().time();
-    \endcode
-
-    \sa QDateTime::toUTC()
-*/
-
-/*!
-    \fn void QDateTime::setTime_t(uint secsSince1Jan1970UTC, Qt::TimeSpec spec)
-
-    Use the single-argument overload of setTime_t() instead.
-*/
-
-/*!
-    \fn QDateTime QDateTime::currentDateTime(Qt::TimeSpec spec)
-
-    Use the currentDateTime() overload that takes no parameters
-    instead.
-*/
 
 // checks if there is an unqoted 'AP' or 'ap' in the string
 static bool hasUnquotedAP(const QString &f)