diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-10-07 15:36:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-07 16:05:43 +0200 |
| commit | 18e6f0ac27cf53bc21cf8c54887932de116648ff (patch) | |
| tree | 835c1b41d24192922212395cc74dd171ac94ebd7 | |
| parent | 4b016819e37e42bd0db36e55b3db9008262ad9f1 (diff) | |
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>
| m--------- | 3rdparty_upstream/chromium | 0 | ||||
| m--------- | 3rdparty_upstream/ninja | 0 | ||||
| -rw-r--r-- | lib/quick/quick.pro | 3 |
3 files changed, 3 insertions, 0 deletions
diff --git a/3rdparty_upstream/chromium b/3rdparty_upstream/chromium deleted file mode 160000 -Subproject 91532d5c5d39ed5f76a5d86a9c4c33a533f8a1f diff --git a/3rdparty_upstream/ninja b/3rdparty_upstream/ninja deleted file mode 160000 -Subproject 6f7ea464bb9161ce2e15deb97977886de152c12 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 |