diff options
author | Tim Jenssen <tim.jenssen@nokia.com> | 2011-08-24 19:06:20 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2011-08-25 11:24:09 +0200 |
commit | 9ca45584588c2231f34252f9fc17485185485012 (patch) | |
tree | ed47f976dc98085cab00ab2f727f05985898838c /installerbuilder/libinstaller | |
parent | 5a925d1bc38a4c8e70f0c0699f66ad8a4ec209c5 (diff) |
component script constructor can cause an exception forward this
Change-Id: If49829105abe7463278837d871c63ea3fd89564f
Reviewed-on: http://codereview.qt.nokia.com/3529
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'installerbuilder/libinstaller')
-rw-r--r-- | installerbuilder/libinstaller/component.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp index 57a9c105f..0ab9987f7 100644 --- a/installerbuilder/libinstaller/component.cpp +++ b/installerbuilder/libinstaller/component.cpp @@ -379,6 +379,12 @@ void Component::loadComponentScript(const QString &fileName) d->m_scriptComponent.construct(); } + //evaluate("Component") and construct can have an exception + if (d->m_scriptEngine.hasUncaughtException()) { + throw Error(tr("Exception while loading the component script %1") + .arg(uncaughtExceptionString(&(d->m_scriptEngine)/*, QFileInfo(file).absoluteFilePath()*/))); + } + emit loaded(); languageChanged(); |