Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

12 files changed, 16 insertions, 27 deletions

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 892a686c89..1d1b6d3c49 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -1496,7 +1496,7 @@ QDebug operator<<(QDebug dbg, const QIcon &i)
         if (!i.name().isEmpty())
             dbg << i.name() << ',';
         dbg << "availableSizes[normal,Off]=" << i.availableSizes()
-            << ",cacheKey=" << showbase << hex << i.cacheKey() << dec << noshowbase;
+            << ",cacheKey=" << Qt::showbase << Qt::hex << i.cacheKey() << Qt::dec << Qt::noshowbase;
     }
     dbg << ')';
     return dbg;
@@ -1523,7 +1523,7 @@ QDebug operator<<(QDebug dbg, const QIcon &i)
     foo@3x.png, then foo@2x, then fall back to foo.png if not found.
 
     \a sourceDevicePixelRatio will be set to the value of N if the argument is
-    a non-null pointer
+    not \nullptr
 */
 QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio,
                         qreal *sourceDevicePixelRatio)
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index 0f834fc2cb..735a3e134d 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -61,19 +61,15 @@ public:
     QIcon() noexcept;
     QIcon(const QPixmap &pixmap);
     QIcon(const QIcon &other);
-#ifdef Q_COMPILER_RVALUE_REFS
     QIcon(QIcon &&other) noexcept
         : d(other.d)
     { other.d = nullptr; }
-#endif
     explicit QIcon(const QString &fileName); // file or resource name
     explicit QIcon(QIconEngine *engine);
     ~QIcon();
     QIcon &operator=(const QIcon &other);
-#ifdef Q_COMPILER_RVALUE_REFS
     inline QIcon &operator=(QIcon &&other) noexcept
     { swap(other); return *this; }
-#endif
     inline void swap(QIcon &other) noexcept
     { qSwap(d, other.d); }
 
diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h
index 0c5b51dc71..89fed5ccda 100644
--- a/src/gui/image/qiconengine.h
+++ b/src/gui/image/qiconengine.h
@@ -94,7 +94,7 @@ public:
     virtual void virtual_hook(int id, void *data);
 
 private:
-    QIconEngine &operator=(const QIconEngine &other) Q_DECL_EQ_DELETE;
+    QIconEngine &operator=(const QIconEngine &other) = delete;
 };
 
 #if QT_DEPRECATED_SINCE(5, 0)
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 9d177142d9..7c68168be8 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -151,18 +151,14 @@ public:
     explicit QImage(const QString &fileName, const char *format = nullptr);
 
     QImage(const QImage &);
-#ifdef Q_COMPILER_RVALUE_REFS
     inline QImage(QImage &&other) noexcept
         : QPaintDevice(), d(nullptr)
     { qSwap(d, other.d); }
-#endif
     ~QImage();
 
     QImage &operator=(const QImage &);
-#ifdef Q_COMPILER_RVALUE_REFS
     inline QImage &operator=(QImage &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
     inline void swap(QImage &other) noexcept
     { qSwap(d, other.d); }
 
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 61f20e0c65..ae433ff651 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -1115,8 +1115,10 @@ bool QImageReader::autoTransform() const
     case QImageReaderPrivate::DoNotApplyTransform:
         return false;
     case QImageReaderPrivate::UsePluginDefault:
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (d->initHandler())
             return d->handler->supportsOption(QImageIOHandler::TransformedByDefault);
+#endif
         Q_FALLTHROUGH();
     default:
         break;
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 56b82abcfa..fe1e4d2c9b 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -54,6 +54,7 @@
 #include "qpainter.h"
 #include "qpainterpath.h"
 #include "qpixmap.h"
+#include "qregexp.h"
 #include "qregion.h"
 #include "qdebug.h"
 
@@ -1485,8 +1486,8 @@ static QPictureHandler *get_picture_handler(const char *format)
     \a format is used to select a handler to write a QPicture; \a header
     is used to select a handler to read an picture file.
 
-    If \a readPicture is a null pointer, the QPictureIO will not be able
-    to read pictures in \a format. If \a writePicture is a null pointer,
+    If \a readPicture is \nullptr, the QPictureIO will not be able
+    to read pictures in \a format. If \a writePicture is \nullptr,
     the QPictureIO will not be able to write pictures in \a format. If
     both are null, the QPictureIO object is valid but useless.
 
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index cac2ef5dfc..189e57b9a3 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -78,10 +78,8 @@ public:
     void setBoundingRect(const QRect &r);
 
     QPicture& operator=(const QPicture &p);
-#ifdef Q_COMPILER_RVALUE_REFS
     inline QPicture &operator=(QPicture &&other) noexcept
     { qSwap(d_ptr, other.d_ptr); return *this; }
-#endif
     inline void swap(QPicture &other) noexcept
     { d_ptr.swap(other.d_ptr); }
     void detach();
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 5b4d218603..399ad7453d 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1689,7 +1689,7 @@ QDebug operator<<(QDebug dbg, const QPixmap &r)
     } else {
         dbg << r.size() << ",depth=" << r.depth()
             << ",devicePixelRatio=" << r.devicePixelRatio()
-            << ",cacheKey=" << showbase << hex << r.cacheKey() << dec << noshowbase;
+            << ",cacheKey=" << Qt::showbase << Qt::hex << r.cacheKey() << Qt::dec << Qt::noshowbase;
     }
     dbg << ')';
     return dbg;
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 2103fcc58c..8c1395857e 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -73,10 +73,8 @@ public:
     ~QPixmap();
 
     QPixmap &operator=(const QPixmap &);
-#ifdef Q_COMPILER_RVALUE_REFS
     inline QPixmap &operator=(QPixmap &&other) noexcept
     { qSwap(data, other.data); return *this; }
-#endif
     inline void swap(QPixmap &other) noexcept
     { qSwap(data, other.data); }
 
@@ -139,12 +137,10 @@ public:
     QImage toImage() const;
     static QPixmap fromImage(const QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor);
     static QPixmap fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags = Qt::AutoColor);
-#ifdef Q_COMPILER_RVALUE_REFS
     static QPixmap fromImage(QImage &&image, Qt::ImageConversionFlags flags = Qt::AutoColor)
     {
         return fromImageInPlace(image, flags);
     }
-#endif
 
     bool load(const QString& fileName, const char *format = nullptr, Qt::ImageConversionFlags flags = Qt::AutoColor);
     bool loadFromData(const uchar *buf, uint len, const char* format = nullptr, Qt::ImageConversionFlags flags = Qt::AutoColor);
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index c5bedb27ab..55af35a5d9 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -55,10 +55,8 @@ public:
     public:
         Key();
         Key(const Key &other);
-#ifdef Q_COMPILER_RVALUE_REFS
         Key(Key &&other) noexcept : d(other.d) { other.d = nullptr; }
         Key &operator =(Key &&other) noexcept { swap(other); return *this; }
-#endif
         ~Key();
         bool operator ==(const Key &key) const;
         inline bool operator !=(const Key &key) const
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index 65a5b63bc7..3cd15b3e4d 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -44,6 +44,7 @@
 
 #include <qimage.h>
 #include <qiodevice.h>
+#include <qregexp.h>
 #include <qvariant.h>
 
 #include <stdio.h>
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index a32dfda96d..deff56aa58 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -45,6 +45,7 @@
 #include <qbytearraymatcher.h>
 #include <qimage.h>
 #include <qmap.h>
+#include <qregexp.h>
 #include <qtextstream.h>
 #include <qvariant.h>
 
@@ -1128,8 +1129,8 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
 
     // write header
     QTextStream s(device);
-    s << "/* XPM */" << endl
-      << "static char *" << fbname(fileName) << "[]={" << endl
+    s << "/* XPM */" << Qt::endl
+      << "static char *" << fbname(fileName) << "[]={" << Qt::endl
       << '\"' << w << ' ' << h << ' ' << ncolors << ' ' << cpp << '\"';
 
     // write palette
@@ -1146,7 +1147,7 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
                                      qGreen(color),
                                      qBlue(color));
         ++c;
-        s << ',' << endl << line;
+        s << ',' << Qt::endl << line;
     }
 
     // write pixels, limit to 4 characters per pixel
@@ -1168,9 +1169,9 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
                 }
             }
         }
-        s << ',' << endl << '\"' << line << '\"';
+        s << ',' << Qt::endl << '\"' << line << '\"';
     }
-    s << "};" << endl;
+    s << "};" << Qt::endl;
     return (s.status() == QTextStream::Ok);
 }