summaryrefslogtreecommitdiffstats
path: root/src/sdk
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-05-11 11:46:44 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-05-11 14:44:30 +0300
commit7f33b7b83320f8d6c9cb40f7d5d9d9842a22e8f8 (patch)
treefa0c06a4603fa1dee54b0c912ffeec426ce69b63 /src/sdk
parent75540998b91fa34659887199ac48d82054361088 (diff)
Add try-catch block for ProductKeyCheck initialization
Change-Id: I04811666c3d26d46e4253a8673643c026851e07f Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/sdk')
-rw-r--r--src/sdk/sdkapp.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
index 5e5e526b4..dc4641f24 100644
--- a/src/sdk/sdkapp.h
+++ b/src/sdk/sdkapp.h
@@ -45,6 +45,7 @@
#include <utils.h>
#include <runoncechecker.h>
#include <globals.h>
+#include <errors.h>
#include <QApplication>
#include <QDir>
@@ -293,7 +294,12 @@ public:
m_core->acceptMessageBoxDefaultButton();
}
- ProductKeyCheck::instance()->init(m_core);
+ try {
+ ProductKeyCheck::instance()->init(m_core);
+ } catch (const QInstaller::Error &e) {
+ errorMessage = e.message();
+ return false;
+ }
ProductKeyCheck::instance()->addPackagesFromXml(QLatin1String(":/metadata/Updates.xml"));
return true;