Compare commits

...

3 Commits

Author SHA1 Message Date
Jani Heikkinen
1734139bf4 Update LA 4.4.1
Task-number: QTBUG-101714
Pick-to: dev 6.3 6.2 5.15
Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>
2022-04-06 17:42:40 +02:00
Qt Submodule Update Bot
7bd9550eb8 Update submodules on '6.3.0 in qt/qt5'
Change-Id: I03e07f99a3972d8dbc33772792e4f8503af49ef6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-06 15:42:30 +00:00
Antti Kokko
8b9d185ad3 Coin: Remove 'Packaging' feature from target which is 'Insignificant'
'Insignificant' feature should not be used with target
that has 'Packaging' feature enabled.

Current:
'Packaging, Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure'

After this change:
'Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure'

Pick-to: 6.3 dev
Change-Id: I0662885db80ed9ca93d5c66902029665382a75fa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-04-06 15:42:18 +00:00
39 changed files with 42 additions and 42 deletions

View File

@@ -1,5 +1,5 @@
QT LICENSE AGREEMENT
Agreement version 4.4
Agreement version 4.4.1
This Qt License Agreement ("Agreement") is a legal agreement for the licensing
of Licensed Software (as defined below) between The Qt Company (as defined
@@ -233,7 +233,7 @@ Appendix 9 hereto.
United States or a legal entity incorporated outside of the United
States or having its registered office outside of the United States,
The Qt Company Ltd., a Finnish company with its registered office at
Bertel Jungin aukio D3A, 02600 Espoo, Finland.
Miestentie 7, 02150 Espoo, Finland.
"Third-Party Software" shall have the meaning set forth in Section 4.
@@ -1054,8 +1054,8 @@ The Agreement includes following Appendices 1-10, as applicable.
- Appendix 1: Licensed Software details
- Appendix 2: Pricing
- Appendix 3: Add-on Software details (optional)
- Appendix 4: Non-commercial and educational Licenses (optional)
- Appendix 5: Small business and startup Licenses (optional)
- Appendix 4: Small business and startup Licenses (optional)
- Appendix 5: Non-commercial and educational Licenses (optional)
- Appendix 6: License Reporting (optional)
- Appendix 7: Marketing Rights (optional)
- Appendix 8: Intentionally left blank (optional)

View File

@@ -45,7 +45,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'Insignificant']
Features: ['Sccache', 'AndroidTestRun', 'Insignificant']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',

2
qt3d

Submodule qt3d updated: f83c75b25d...80ef7cf797

2
qtbase

Submodule qtbase updated: 136407e3eb...9554d315aa

2
qtcoap

Submodule qtcoap updated: 50fc1563ba...25a1c973e6

2
qtdoc

Submodule qtdoc updated: 794831cc94...47496430db

2
qtmqtt

Submodule qtmqtt updated: b58fab105a...6980d4e038

Submodule qtopcua updated: 98f2e03163...b0b3ef3298

2
qtqa

Submodule qtqa updated: fe72232e88...e6ce035337

Submodule qtscxml updated: da0dc6b526...e2402cd6b8

2
qtsvg

Submodule qtsvg updated: 068d38969c...8c0a12af45

Submodule qttools updated: 4927053724...ca3066f3ed