From 01a80f5e435bc116e00c955105a957e51fc25bba Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 26 Feb 2022 23:12:25 +0200 Subject: [PATCH] set temporary file removal to false since it will be used after closing it in NewForm::openTemplate() Signed-off-by: Ivailo Monev --- src/core/global/qconfig.h.cmake | 10 +++++----- src/scripttools/debugging/qscriptedit.cpp | 2 +- src/tools/designer/newform.cpp | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake index 8560ccbe4..855abecad 100644 --- a/src/core/global/qconfig.h.cmake +++ b/src/core/global/qconfig.h.cmake @@ -141,6 +141,11 @@ // #cmakedefine QT_NO_STANDARDITEMMODEL // #cmakedefine QT_NO_STATUSBAR // #cmakedefine QT_NO_STATUSTIP +// #cmakedefine QT_NO_TABBAR +// #cmakedefine QT_NO_TABWIDGET +// #cmakedefine QT_NO_TABLEVIEW +// #cmakedefine QT_NO_TABLEWIDGET +// #cmakedefine QT_NO_TEMPORARYFILE // Misc #cmakedefine QT_NO_USING_NAMESPACE @@ -192,11 +197,6 @@ #cmakedefine QT_NO_SYNTAXHIGHLIGHTER #cmakedefine QT_NO_SYSTEMSEMAPHORE #cmakedefine QT_NO_SYSTEMTRAYICON -#cmakedefine QT_NO_TABBAR -#cmakedefine QT_NO_TABLEVIEW -#cmakedefine QT_NO_TABLEWIDGET -#cmakedefine QT_NO_TABWIDGET -#cmakedefine QT_NO_TEMPORARYFILE #cmakedefine QT_NO_TEXTBROWSER #cmakedefine QT_NO_TEXTCONTROL #cmakedefine QT_NO_TEXTDATE diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index e51f27529..7fe4d71f7 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -313,7 +313,7 @@ void QScriptEdit::extraAreaPaintEvent(QPaintEvent *e) int radius = fm.lineSpacing() - 1; QRect r(rect.x(), (int)top, radius, radius); QIcon icon(m_breakpoints[lineNumber].enabled - ? QString::fromLatin1("%1/breakpoint.png").arg(imagesPath)) + ? QString::fromLatin1("%1/breakpoint.png").arg(imagesPath) : QString::fromLatin1("%1/d_breakpoint.png").arg(imagesPath)); icon.paint(&painter, r, Qt::AlignCenter); } diff --git a/src/tools/designer/newform.cpp b/src/tools/designer/newform.cpp index 8e6e18a42..d30752454 100644 --- a/src/tools/designer/newform.cpp +++ b/src/tools/designer/newform.cpp @@ -176,7 +176,8 @@ bool NewForm::openTemplate(QString *ptrToErrorMessage) tempPattern += QLatin1String("XXXXXX.ui"); QTemporaryFile tempFormFile(tempPattern); - tempFormFile.setAutoRemove(true); + // TODO: leaking file? + tempFormFile.setAutoRemove(false); if (!tempFormFile.open()) { *ptrToErrorMessage = tr("A temporary form file could not be created in %1.").arg(QDir::tempPath()); return false; -- 2.11.0