From 18e6f0ac27cf53bc21cf8c54887932de116648ff Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Mon, 7 Oct 2013 15:36:48 +0200
Subject: [PATCH] We should still be able to build with Qt 5.1 for the time
 being.

Also remove 3rdparty_upstream from from submodules, accidentally
added in https://codereview.qt-project.org/#change,67241
This fixes init-repository.py.

Change-Id: I08c095e4830581156efc3f069e00e733dda1ffd8
Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 3rdparty_upstream/chromium | 1 -
 3rdparty_upstream/ninja    | 1 -
 lib/quick/quick.pro        | 3 +++
 3 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 160000 3rdparty_upstream/chromium
 delete mode 160000 3rdparty_upstream/ninja

diff --git a/3rdparty_upstream/chromium b/3rdparty_upstream/chromium
deleted file mode 160000
index 91532d5c5..000000000
--- a/3rdparty_upstream/chromium
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 91532d5c5d39ed5f76a5d86a9c4c33a533f8a1ff
diff --git a/3rdparty_upstream/ninja b/3rdparty_upstream/ninja
deleted file mode 160000
index 6f7ea464b..000000000
--- a/3rdparty_upstream/ninja
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6f7ea464bb9161ce2e15deb97977886de152c12d
diff --git a/lib/quick/quick.pro b/lib/quick/quick.pro
index 859bc16bc..78650dedc 100644
--- a/lib/quick/quick.pro
+++ b/lib/quick/quick.pro
@@ -6,6 +6,9 @@ IMPORT_VERSION = 1.0
 QT += qml quick
 QT_PRIVATE += qml-private quick-private gui-private core-private
 
+# Remove this as soon as we have a hard-dependency on Qt 5.2
+qtHaveModule(v8): QT_PRIVATE += v8-private
+
 INCLUDEPATH += ../
 
 # FIXME: all this should eventually be turned into QT += webenginecore
-- 
GitLab