From e4ba1c1d81a740778813345cb3dacb4ba33df9db Mon Sep 17 00:00:00 2001
From: Joni Poikelin <joni.poikelin@qt.io>
Date: Wed, 29 Jan 2020 19:46:10 +0200
Subject: Fix building against Qt 5.14 and newer

Fixes: QTIFW-1526
Change-Id: I085dd8b2818f26058432d165a1250b3ac67e1dda
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
---
 src/libs/installer/component.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/libs/installer/component.cpp')

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index e8abe2383..6f15b0fdf 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>
 
-- 
cgit v1.2.3


From fbf763b7338f802b0d0ce9fe5e812950b853f30c Mon Sep 17 00:00:00 2001
From: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Date: Mon, 2 Mar 2020 13:03:53 +0200
Subject: Fix incorrect ScriptLoadingFailed enumerator scope resolution

This was causing problems while building with msvc2013.

Change-Id: Idd6b3b4c55d2cedb946b22db75d95222d37fe64b
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
---
 src/libs/installer/component.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libs/installer/component.cpp')

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 6f15b0fdf..5fc321df3 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -556,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());
             qWarning() << error.message();
         } else {
             throw error;
-- 
cgit v1.2.3