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

 Conflicts:
	src/qdoc/qdocdatabase.h

Change-Id: I044c17d6a953c9689a4d928972d3fd757e468114

2 files changed, 2 insertions, 2 deletions

diff --git a/src/pixeltool/main.cpp b/src/pixeltool/main.cpp
index 36f411749..3e17d61b5 100644
--- a/src/pixeltool/main.cpp
+++ b/src/pixeltool/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
     QPixelTool pixelTool;
 
     if (!parser.positionalArguments().isEmpty()) {
-        const QString previewImageFileName = parser.positionalArguments().first();
+        const QString previewImageFileName = parser.positionalArguments().constFirst();
         if (QFileInfo(previewImageFileName).exists()) {
             QImage previewImage(previewImageFileName);
             if (!previewImage.size().isEmpty())
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index cfd933e4d..8025d0b0d 100644
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -562,7 +562,7 @@ void QPixelTool::saveToFile()
     }
 
     while (fileDialog.exec() == QDialog::Accepted
-        && !m_buffer.save(fileDialog.selectedFiles().first())) {
+        && !m_buffer.save(fileDialog.selectedFiles().constFirst())) {
         QMessageBox::warning(this, QLatin1String("Unable to write image"),
                              QLatin1String("Unable to write ")
                              + QDir::toNativeSeparators(fileDialog.selectedFiles().first()));