diff options
| author | Joni Poikelin <joni.poikelin@qt.io> | 2020-01-29 19:46:10 +0200 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@qt.io> | 2020-02-03 05:28:48 +0000 |
| commit | e4ba1c1d81a740778813345cb3dacb4ba33df9db (patch) | |
| tree | 39cc6a87ef12ef2e2740788ade40f86dec54e837 | |
| parent | a45524be8c8cc74f168a479653a04f97b1689def (diff) | |
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>
| -rw-r--r-- | src/libs/installer/component.cpp | 4 | ||||
| -rw-r--r-- | src/libs/installer/extractarchiveoperation.cpp | 1 |
2 files changed, 5 insertions, 0 deletions
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> diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp index b5bf96954..3e6c94fb2 100644 --- a/src/libs/installer/extractarchiveoperation.cpp +++ b/src/libs/installer/extractarchiveoperation.cpp @@ -33,6 +33,7 @@ #include <QEventLoop> #include <QThreadPool> #include <QFileInfo> +#include <QDataStream> namespace QInstaller { |