diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-03-23 15:12:30 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-05-22 14:11:25 +0200 |
| commit | 44f23572e7a53ba510dba5925cf32ec2061882cc (patch) | |
| tree | e64f86d6482258765f515c4a6c123f56b74a8ea5 /dependencies.yaml | |
| parent | 5f12127c9087a022d32ae91499f82157b0b49eff (diff) | |
Switch builds to cmake
* move the sync profile, so we can sync headers for the libs
project
* update dependencies
* add coin module config
* extend timeout for build
* bump version to 6.2
* disable qmake build by deleting the main pro file
* tweak product dependencies, cheat and point to even
not merged change
Task-number: QTBUG-91760
Change-Id: I02d6cda3a4ce09575ae993836b5089e1655401b9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'dependencies.yaml')
| -rw-r--r-- | dependencies.yaml | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 43ad31057..7e2950afd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,6 +1,12 @@ dependencies: + ../qtbase: + ref: 640eb55c130c6c2c982dc212a8a5bd2b8fb7a225 + required: true + ../qtshadertools: + ref: cf08b62f103b8e2bc3e9a117ccd262d7a278a260 + required: true ../qtdeclarative: - ref: fa87052d56526e1529e694fb1c69c69eec38f2fd + ref: 3e9cece90ae7097bbf915ef1e941390abecf28a8 required: true # ../qtlocation: # ref: a8793c6d9695498b3a53793f21859421262b4541 @@ -8,12 +14,12 @@ dependencies: # ../qtquickcontrols: # ref: 59749d56d666a6687fcedc2f7892080467db8574 # required: false - ../qtquickcontrols2: - ref: 9a19ec26f45e7382431f52136f03887cfaa04b66 - required: false - ../qttools: - ref: 3fd594493c3ba31639a7515b901554456a90b4c7 - required: false - ../qtwebchannel: - ref: 0e13bd10bc7f31b1540987faeb0e3c83668daa3e - required: false +# ../qtquickcontrols2: +# ref: 9a19ec26f45e7382431f52136f03887cfaa04b66 +# required: false +# ../qttools: +# ref: 3fd594493c3ba31639a7515b901554456a90b4c7 +# required: false +# ../qtwebchannel: +# ref: 0e13bd10bc7f31b1540987faeb0e3c83668daa3e +# required: false |