Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id3978877eb1ee8ca748705b2a55b5fdabb52fcf5

2 files changed, 15 insertions, 23 deletions

diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index adcfb6a38..67a1b4011 100644
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -33,7 +33,7 @@
 #include <qdir.h>
 #include <qapplication.h>
 #include <qscreen.h>
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
 #include <qclipboard.h>
 #endif
 #include <qpainter.h>
@@ -67,14 +67,6 @@ static QPoint initialPos(const QSettings &settings, const QSize &initialSize)
 
 QPixelTool::QPixelTool(QWidget *parent)
     : QWidget(parent)
-    , m_freeze(false)
-    , m_displayZoom(false)
-    , m_displayGridSize(false)
-    , m_mouseDown(false)
-    , m_preview_mode(false)
-    , m_displayZoomId(0)
-    , m_displayGridSizeId(0)
-    , m_currentColor(0)
 {
     setWindowTitle(QCoreApplication::applicationName());
     QSettings settings(QLatin1String("QtProject"), QLatin1String("QPixelTool"));
@@ -313,12 +305,12 @@ void QPixelTool::keyPressEvent(QKeyEvent *e)
     case Qt::Key_A:
         m_autoUpdate = !m_autoUpdate;
         break;
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
     case Qt::Key_C:
         if (e->modifiers() & Qt::ControlModifier)
             copyToClipboard();
         break;
-#endif
+#endif // QT_CONFIG(clipboard)
     case Qt::Key_S:
         if (e->modifiers() & Qt::ControlModifier) {
             releaseKeyboard();
@@ -453,10 +445,10 @@ void QPixelTool::contextMenuEvent(QContextMenuEvent *e)
     // Copy to clipboard / save
     menu.addAction(QLatin1String("Save as image..."),
                    this, &QPixelTool::saveToFile, QKeySequence::SaveAs);
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
     menu.addAction(QLatin1String("Copy to clipboard"),
                    this, &QPixelTool::copyToClipboard, QKeySequence::Copy);
-#endif
+#endif // QT_CONFIG(clipboard)
 
     menu.addSeparator();
     menu.addAction(QLatin1String("About Qt"), qApp, &QApplication::aboutQt);
@@ -642,12 +634,12 @@ void QPixelTool::setGridSize(int gridSize)
     }
 }
 
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
 void QPixelTool::copyToClipboard()
 {
     QGuiApplication::clipboard()->setPixmap(m_buffer);
 }
-#endif
+#endif // QT_CONFIG(clipboard)
 
 void QPixelTool::saveToFile()
 {
diff --git a/src/pixeltool/qpixeltool.h b/src/pixeltool/qpixeltool.h
index ecf912353..beb786fd2 100644
--- a/src/pixeltool/qpixeltool.h
+++ b/src/pixeltool/qpixeltool.h
@@ -51,7 +51,7 @@ public slots:
     void toggleGrid();
     void toggleFreeze();
     void setZoomVisible(bool visible);
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
     void copyToClipboard();
 #endif
     void saveToFile();
@@ -78,12 +78,12 @@ private:
     void startGridSizeVisibleTimer();
     QString aboutText() const;
 
-    bool m_freeze;
-    bool m_displayZoom;
-    bool m_displayGridSize;
-    bool m_mouseDown;
+    bool m_freeze = false;
+    bool m_displayZoom = false;
+    bool m_displayGridSize = false;
+    bool m_mouseDown = false;
     bool m_autoUpdate;
-    bool m_preview_mode;
+    bool m_preview_mode = false;
 
     int m_gridActive;
     int m_zoom;
@@ -92,9 +92,9 @@ private:
 
     int m_updateId;
     int m_displayZoomId;
-    int m_displayGridSizeId;
+    int m_displayGridSizeId = 0;
 
-    int m_currentColor;
+    QRgb m_currentColor = 0;
 
     QPoint m_lastMousePos;
     QPoint m_dragStart;