From 495f94dde89cc9826c8a9a27a6c925a7e3b3eba8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Nov 2017 04:09:37 -0500 Subject: [PATCH] [calamares] Silence QBasicTimer warning message. Relying on auto-qobject deletion on shutdown generates a warning message 17:23:44 [0]: QBasicTimer::start: QBasicTimer can only be used with threads started with QThread which is annoying. Since we're in shutdown, just skip deletion entirely, and leave the model unparented. FIXES #472 --- src/calamares/CalamaresApplication.cpp | 2 +- src/calamares/progresstree/ProgressTreeView.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 6389a2806..caba96f5d 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -356,7 +356,7 @@ CalamaresApplication::initViewSteps() { cDebug() << "STARTUP: loadModules for all modules done"; m_mainwindow->show(); - ProgressTreeModel* m = new ProgressTreeModel( this ); + ProgressTreeModel* m = new ProgressTreeModel( nullptr ); ProgressTreeView::instance()->setModel( m ); cDebug() << "STARTUP: Window now visible and ProgressTreeView populated"; } diff --git a/src/calamares/progresstree/ProgressTreeView.cpp b/src/calamares/progresstree/ProgressTreeView.cpp index 7fc44d146..6dd33b951 100644 --- a/src/calamares/progresstree/ProgressTreeView.cpp +++ b/src/calamares/progresstree/ProgressTreeView.cpp @@ -62,7 +62,6 @@ ProgressTreeView::ProgressTreeView( QWidget* parent ) ProgressTreeView::~ProgressTreeView() { - }