diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 14:37:20 +0100 |
commit | a2edd6add546b0596e5908291d3e0153ff487f08 (patch) | |
tree | f599afdbe38157c844212c36a1690ff903df4fd2 /src/pixeltool | |
parent | b7a6bbf420d1eed9daefd232dc48933e7d6f7c4e (diff) | |
parent | 6491ca02253f3245333611cabf248ef01bd31883 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/qdoc/qdocdatabase.h
Change-Id: I044c17d6a953c9689a4d928972d3fd757e468114
Diffstat (limited to 'src/pixeltool')
-rw-r--r-- | src/pixeltool/main.cpp | 2 | ||||
-rw-r--r-- | src/pixeltool/qpixeltool.cpp | 2 |
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())); |