1 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 191217cdc4..41fe649fc5 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -132,7 +132,7 @@ static void qt_cleanup_icon_cache()
     if Qt::AA_UseHighDpiPixmaps is not set this function
     returns 1.0 to keep non-hihdpi aware code working.
 */
-static qreal qt_effective_device_pixel_ratio(QWindow *window = 0)
+static qreal qt_effective_device_pixel_ratio(QWindow *window = nullptr)
 {
     if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps))
         return qreal(1.0);
@@ -228,7 +228,7 @@ static QPixmapIconEngineEntry *bestSizeMatch( const QSize &size, QPixmapIconEngi
 
 QPixmapIconEngineEntry *QPixmapIconEngine::tryMatch(const QSize &size, QIcon::Mode mode, QIcon::State state)
 {
-    QPixmapIconEngineEntry *pe = 0;
+    QPixmapIconEngineEntry *pe = nullptr;
     for (int i = 0; i < pixmaps.count(); ++i)
         if (pixmaps.at(i).mode == mode && pixmaps.at(i).state == state) {
             if (pe)
@@ -674,7 +674,7 @@ QFactoryLoader *qt_iconEngineFactoryLoader()
   Constructs a null icon.
 */
 QIcon::QIcon() noexcept
-    : d(0)
+    : d(nullptr)
 {
 }
 
@@ -682,7 +682,7 @@ QIcon::QIcon() noexcept
   Constructs an icon from a \a pixmap.
  */
 QIcon::QIcon(const QPixmap &pixmap)
-    :d(0)
+    :d(nullptr)
 {
     addPixmap(pixmap);
 }
@@ -723,7 +723,7 @@ QIcon::QIcon(const QIcon &other)
     complete list of the supported file formats.
 */
 QIcon::QIcon(const QString &fileName)
-    : d(0)
+    : d(nullptr)
 {
     addFile(fileName);
 }
@@ -782,7 +782,7 @@ QIcon &QIcon::operator=(const QIcon &other)
 */
 QIcon::operator QVariant() const
 {
-    return QVariant(QVariant::Icon, this);
+    return QVariant(QMetaType::QIcon, this);
 }
 
 /*! \fn int QIcon::serialNumber() const
@@ -838,7 +838,7 @@ QPixmap QIcon::pixmap(const QSize &size, Mode mode, State state) const
 {
     if (!d)
         return QPixmap();
-    return pixmap(0, size, mode, state);
+    return pixmap(nullptr, size, mode, state);
 }
 
 /*!
@@ -878,7 +878,7 @@ QSize QIcon::actualSize(const QSize &size, Mode mode, State state) const
 {
     if (!d)
         return QSize();
-    return actualSize(0, size, mode, state);
+    return actualSize(nullptr, size, mode, state);
 }
 
 /*!
@@ -1008,7 +1008,7 @@ void QIcon::detach()
         if (d->engine->isNull()) {
             if (!d->ref.deref())
                 delete d;
-            d = 0;
+            d = nullptr;
             return;
         } else if (d->ref.loadRelaxed() != 1) {
             QIconPrivate *x = new QIconPrivate(d->engine->clone());