diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-13 13:30:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-13 14:04:47 +0200 |
| commit | 14d2852597f7c869e91db2f54d954965af6083fb (patch) | |
| tree | 035bccb3e28f31abef1b1e39a4ca384726d2fb76 /coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt | |
| parent | 8c2ecdbc27532cf875cf47ce75654be98b3d7e20 (diff) | |
| parent | 1eae3c41854294216e600f3f4a7dfc3987d30d0b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
.gitmodules
Ignore qtquick3d for now.
coin/platform_configs/default.txt
coin/platform_configs/default.yaml
coin/platform_configs/qtbase.txt
coin/platform_configs/qtbase.yaml
We use yaml files for configurations now.
Adjust the configurations for Qt6 as it was
done before in the .txt files.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
Diffstat (limited to 'coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt')
| -rw-r--r-- | coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt deleted file mode 100644 index d7806e94..00000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt +++ /dev/null @@ -1,4 +0,0 @@ -1479836260 -CMakeLists.txt: 6ce169fb0b2f6eaa5d054d1dc007fc81 -FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56 -conanfile.py: e8de244463aa84c51238f1fd22a1ae00
\ No newline at end of file |