diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-10-01 16:21:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-01 16:21:12 +0200 |
| commit | 8ee9774e67edf57d891528749a360a0af8f0c6f7 (patch) | |
| tree | e0b7d4b19c26c48fe41e930532f2037f8dc43204 /src/tools/uic | |
| parent | d78fb442d750b33afe2e41f31588ec94cf4023ad (diff) | |
| parent | 8ab25620d3df25c43011ae982f4614639578afb3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/tools/uic')
| -rw-r--r-- | src/tools/uic/uic.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index e5f092b558..2bee9de1e8 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -211,6 +211,7 @@ bool Uic::write(QIODevice *in) #ifdef QT_UIC_JAVA_GENERATOR if (language.toLower() != QLatin1String("jambi")) { fprintf(stderr, "uic: File is not a 'jambi' form\n"); + delete ui; return false; } rtn = jwrite (ui); @@ -221,6 +222,7 @@ bool Uic::write(QIODevice *in) #ifdef QT_UIC_CPP_GENERATOR if (!language.isEmpty() && language.toLower() != QLatin1String("c++")) { fprintf(stderr, "uic: File is not a 'c++' ui file, language=%s\n", qPrintable(language)); + delete ui; return false; } |