diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index d8839a0ef6e..72dce2e2977 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -3716,18 +3716,17 @@ int generateJavaQmlComponents(const Options &options) return false; QTextStream outputStream; - std::unique_ptr outputFile; + QFile outputFile; if (!leafEqualsLibname) { - outputFile.reset(new QFile("%1/%2.java"_L1.arg(outputDir, libClassname))); - if (outputFile->exists()) - outputFile->remove(); - if (!outputFile->open(QFile::ReadWrite)) { - fprintf(stderr, "Cannot open %s file to write.\n", - qPrintable(outputFile->fileName())); + outputFile.setFileName("%1/%2.java"_L1.arg(outputDir, libClassname)); + if (outputFile.exists()) + outputFile.remove(); + if (!outputFile.open(QFile::WriteOnly)) { + fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile.fileName())); return false; } - outputStream.setDevice(outputFile.get()); + outputStream.setDevice(&outputFile); createHeaderBlock(outputStream, javaPackage); beginLibraryBlock(outputStream, libClassname); } @@ -3759,15 +3758,15 @@ int generateJavaQmlComponents(const Options &options) outputStreamDevice->close(); } - outputFile.reset(new QFile("%1/%2.java"_L1.arg(outputDir,moduleClassname))); - if (outputFile->exists() && !outputFile->remove()) + outputFile.setFileName("%1/%2.java"_L1.arg(outputDir,moduleClassname)); + if (outputFile.exists() && !outputFile.remove()) return false; - if (!outputFile->open(QFile::ReadWrite)) { - fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile->fileName())); + if (!outputFile.open(QFile::WriteOnly)) { + fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile.fileName())); return false; } - outputStream.setDevice(outputFile.get()); + outputStream.setDevice(&outputFile); createHeaderBlock(outputStream, javaPackage); }