2 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 7d59dddec..6b6009ac2 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -550,6 +550,10 @@ PackageManagerCore::~PackageManagerCore()
         QInstaller::VerboseWriter::instance()->setOutputStream(logFileName);
     }
     delete d;
+
+    QMutexLocker _(&sVirtualComponentsFontMutex);
+    delete sVirtualComponentsFont;
+    sVirtualComponentsFont = 0;
 }
 
 /* static */
diff --git a/src/libs/installer/productkeycheck.cpp b/src/libs/installer/productkeycheck.cpp
index f975db821..120014dad 100644
--- a/src/libs/installer/productkeycheck.cpp
+++ b/src/libs/installer/productkeycheck.cpp
@@ -47,10 +47,8 @@ ProductKeyCheck::~ProductKeyCheck()
 
 ProductKeyCheck *ProductKeyCheck::instance()
 {
-    static ProductKeyCheck *instance = 0;
-    if (instance == 0)
-        instance = new ProductKeyCheck();
-    return instance;
+    static ProductKeyCheck instance;
+    return &instance;
 }
 
 bool ProductKeyCheck::hasValidKey()