diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 15:09:37 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:03:03 +0100 |
commit | 26c5243491f495194f04b449128dae36118e28da (patch) | |
tree | 7fb14678a6fc9e44a10c9224d005e2cbdc6bcb63 /src/imports/testlib/dependencies.json | |
parent | 1c7d264e3b2e9a2f0021786ea6967185f8282af0 (diff) | |
parent | c24c5baeda4101b0058689adf9200b77a722c3a2 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
src/qml/qml/qqmlengine.cpp
Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Diffstat (limited to 'src/imports/testlib/dependencies.json')
-rw-r--r-- | src/imports/testlib/dependencies.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/testlib/dependencies.json b/src/imports/testlib/dependencies.json new file mode 100644 index 0000000000..b2c4125178 --- /dev/null +++ b/src/imports/testlib/dependencies.json @@ -0,0 +1 @@ +["QtQuick 2.0", "QtQuick.Window 2.0"] |