Merge remote-tracking branch 'origin/3.2' to master

Change-Id: Ia4cf718409ce431cce8d766865ecec506426afb9

1 files changed, 5 insertions, 1 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 7ad68d24d..503b9434c 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -50,7 +50,11 @@
 
 #include <QtUiTools/QUiLoader>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+#include <private/qv4engine_p.h>
+#else
 #include <private/qv8engine_p.h>
+#endif
 #include <private/qv4scopedvalue_p.h>
 #include <private/qv4object_p.h>
 
@@ -552,7 +556,7 @@ void Component::loadComponentScript(const QString &fileName)
         }
     } catch (const Error &error) {
         if (packageManagerCore()->settings().allowUnstableComponents()) {
-            setUnstable(Component::Component::ScriptLoadingFailed, error.message());
+            setUnstable(Component::UnstableError::ScriptLoadingFailed, error.message());
             qCWarning(QInstaller::lcInstallerInstallLog) << error.message();
         } else {
             throw error;