From fb3e18bd4ba7c08346290cf498f28bf82a7162d9 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 2 May 2019 16:46:24 +0200 Subject: [PATCH] Fix missing header guards in UI files If you can call "uic < file_name" instead of "uic file_name" you get no header guards. Change-Id: I05c425aa896eead85123aea420bcd82edc9953b5 Fixes: QTCREATORBUG-22396 Reviewed-by: Christian Kandeler --- src/plugins/qtsupport/uicgenerator.cpp | 5 ++--- src/plugins/qtsupport/uicgenerator.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp index 2029d69a56e..e0cddab37d8 100644 --- a/src/plugins/qtsupport/uicgenerator.cpp +++ b/src/plugins/qtsupport/uicgenerator.cpp @@ -65,10 +65,9 @@ Utils::FileName UicGenerator::command() const return Utils::FileName::fromString(version->uicCommand()); } -void UicGenerator::handleProcessStarted(QProcess *process, const QByteArray &sourceContents) +QStringList UicGenerator::arguments() const { - process->write(sourceContents); - process->closeWriteChannel(); + return {source().toString()}; } FileNameToContentsHash UicGenerator::handleProcessFinished(QProcess *process) diff --git a/src/plugins/qtsupport/uicgenerator.h b/src/plugins/qtsupport/uicgenerator.h index b0253eb73c2..115343ae950 100644 --- a/src/plugins/qtsupport/uicgenerator.h +++ b/src/plugins/qtsupport/uicgenerator.h @@ -41,7 +41,7 @@ public: protected: Utils::FileName command() const override; - void handleProcessStarted(QProcess *process, const QByteArray &sourceContents) override; + QStringList arguments() const override; ProjectExplorer::FileNameToContentsHash handleProcessFinished(QProcess *process) override; };