Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	dist/changes-5.0.0
	mkspecs/features/qt_module_config.prf
	qmake/project.cpp
	qmake/property.cpp

Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296

4 files changed, 13 insertions, 15 deletions

diff --git a/src/widgets/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h
index be93c47476..95de435846 100644
--- a/src/widgets/graphicsview/qgraphicssceneevent.h
+++ b/src/widgets/graphicsview/qgraphicssceneevent.h
@@ -66,7 +66,7 @@ class QGraphicsSceneEventPrivate;
 class Q_WIDGETS_EXPORT QGraphicsSceneEvent : public QEvent
 {
 public:
-    QGraphicsSceneEvent(Type type);
+    explicit QGraphicsSceneEvent(Type type);
     ~QGraphicsSceneEvent();
 
     QWidget *widget() const;
@@ -84,7 +84,7 @@ class QGraphicsSceneMouseEventPrivate;
 class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent
 {
 public:
-    QGraphicsSceneMouseEvent(Type type = None);
+    explicit QGraphicsSceneMouseEvent(Type type = None);
     ~QGraphicsSceneMouseEvent();
 
     QPointF pos() const;
@@ -132,7 +132,7 @@ class QGraphicsSceneWheelEventPrivate;
 class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent
 {
 public:
-    QGraphicsSceneWheelEvent(Type type = None);
+    explicit QGraphicsSceneWheelEvent(Type type = None);
     ~QGraphicsSceneWheelEvent();
 
     QPointF pos() const;
@@ -167,7 +167,7 @@ class Q_WIDGETS_EXPORT QGraphicsSceneContextMenuEvent : public QGraphicsSceneEve
 public:
     enum Reason { Mouse, Keyboard, Other };
 
-    QGraphicsSceneContextMenuEvent(Type type = None);
+    explicit QGraphicsSceneContextMenuEvent(Type type = None);
     ~QGraphicsSceneContextMenuEvent();
 
     QPointF pos() const;
@@ -194,7 +194,7 @@ class QGraphicsSceneHoverEventPrivate;
 class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent
 {
 public:
-    QGraphicsSceneHoverEvent(Type type = None);
+    explicit QGraphicsSceneHoverEvent(Type type = None);
     ~QGraphicsSceneHoverEvent();
 
     QPointF pos() const;
@@ -227,7 +227,7 @@ class QGraphicsSceneHelpEventPrivate;
 class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent
 {
 public:
-    QGraphicsSceneHelpEvent(Type type = None);
+    explicit QGraphicsSceneHelpEvent(Type type = None);
     ~QGraphicsSceneHelpEvent();
 
     QPointF scenePos() const;
@@ -245,7 +245,7 @@ class QGraphicsSceneDragDropEventPrivate;
 class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
 {
 public:
-    QGraphicsSceneDragDropEvent(Type type = None);
+    explicit QGraphicsSceneDragDropEvent(Type type = None);
     ~QGraphicsSceneDragDropEvent();
 
     QPointF pos() const;
diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h
index 8c412680b8..5e121def41 100644
--- a/src/widgets/kernel/qgesture.h
+++ b/src/widgets/kernel/qgesture.h
@@ -270,7 +270,7 @@ class QGestureEventPrivate;
 class Q_WIDGETS_EXPORT QGestureEvent : public QEvent
 {
 public:
-    QGestureEvent(const QList<QGesture *> &gestures);
+    explicit QGestureEvent(const QList<QGesture *> &gestures);
     ~QGestureEvent();
 
     QList<QGesture *> gestures() const;
diff --git a/src/widgets/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp
index 4f244b1027..369e26c21e 100644
--- a/src/widgets/kernel/qicon.cpp
+++ b/src/widgets/kernel/qicon.cpp
@@ -616,7 +616,8 @@ QIcon::operator QVariant() const
     return QVariant(QVariant::Icon, this);
 }
 
-/*! \obsolete
+/*! \fn int QIcon::serialNumber() const
+    \obsolete
 
     Returns a number that identifies the contents of this
     QIcon object. Distinct QIcon objects can have
@@ -633,11 +634,6 @@ QIcon::operator QVariant() const
     \sa QPixmap::serialNumber()
 */
 
-int QIcon::serialNumber() const
-{
-    return d ? d->serialNum : 0;
-}
-
 /*!
     Returns a number that identifies the contents of this QIcon
     object. Distinct QIcon objects can have the same key if
diff --git a/src/widgets/kernel/qicon.h b/src/widgets/kernel/qicon.h
index 7bef500946..c6e07ba3e2 100644
--- a/src/widgets/kernel/qicon.h
+++ b/src/widgets/kernel/qicon.h
@@ -94,7 +94,9 @@ public:
     bool isDetached() const;
     void detach();
 
-    int serialNumber() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
+#endif
     qint64 cacheKey() const;
 
     void addPixmap(const QPixmap &pixmap, Mode mode = Normal, State state = Off);