aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/uicgenerator.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2019-07-18 16:09:54 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2019-07-19 06:27:35 +0000
commit524cdf54bc8996ba2d7bbae1c61acb3e0b86f77a (patch)
tree06a0342d4dbd1248bbee070c03b91b27eb726f74 /src/plugins/qtsupport/uicgenerator.cpp
parentc65e480cbd9511b0641d9fdc46c86694767b3a87 (diff)
QtSupport: Fix handling of not yet saved *.ui files
Since commit fb3e18bd4ba7c08346290cf498f28bf82a7162d9 Fix missing header guards in UI files the uic input comes from a file (on disk) and thus the source contents from the edited and not yet saved *.ui file (Designer mode) was ignored. Revert the relevant part. This should not introduce a regression as commit 47312b04c0878e0c308794cde08e92c03d4be29e QtSupport: Fix header guard for ui files basically superseded the first change, handling the proper inclusion of the generated header file. Fixes: QTCREATORBUG-22740 Change-Id: Iec6550817941eea99f823c377680b9a6fa5564e8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/uicgenerator.cpp')
-rw-r--r--src/plugins/qtsupport/uicgenerator.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp
index abf8790016..19248f3b36 100644
--- a/src/plugins/qtsupport/uicgenerator.cpp
+++ b/src/plugins/qtsupport/uicgenerator.cpp
@@ -67,7 +67,7 @@ Utils::FilePath UicGenerator::command() const
QStringList UicGenerator::arguments() const
{
- return {"-p", source().toString()};
+ return {"-p"};
}
FileNameToContentsHash UicGenerator::handleProcessFinished(QProcess *process)
@@ -87,6 +87,12 @@ FileNameToContentsHash UicGenerator::handleProcessFinished(QProcess *process)
return result;
}
+void UicGenerator::handleProcessStarted(QProcess *process, const QByteArray &sourceContents)
+{
+ process->write(sourceContents);
+ process->closeWriteChannel();
+}
+
FileType UicGeneratorFactory::sourceType() const
{
return FileType::Form;