diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-17 11:54:35 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-26 13:43:44 +0200 |
| commit | 55874781a1d66694e4db988403ae66c35041b179 (patch) | |
| tree | 71aea3ae2c1040e0768562f14c9e41dded485422 | |
| parent | 4f3dac297e83d52fab1d11a9883cf1aa7e75684d (diff) | |
Change all additional libraries to addons
It has been decided to *not* ship source-only Conan packages in Qt 6.1,
but revert back to delivering the additional libraries similarly as with
Qt 5.
That's why we need to switch all additional libraries to addon to start
building binaries for those as well in qt5.git integration.
Task-number: QTBUG-91796
Pick-to: dev
Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| -rw-r--r-- | .gitmodules | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules index 44523739..317ca556 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,7 +22,7 @@ path = qtactiveqt url = ../qtactiveqt.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative @@ -126,14 +126,14 @@ path = qt3d url = ../qt3d.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtimageformats"] depends = qtbase recommends = qttools path = qtimageformats url = ../qtimageformats.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -240,21 +240,21 @@ path = qtcharts url = ../qtcharts.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia qttools path = qtdatavis3d url = ../qtdatavis3d.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols qttools path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative @@ -268,7 +268,7 @@ path = qtscxml url = ../qtscxml.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia @@ -282,7 +282,7 @@ path = qtnetworkauth url = ../qtnetworkauth.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative @@ -303,7 +303,7 @@ path = qtlottie url = ../qtlottie.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline @@ -333,16 +333,16 @@ path = qtcoap url = ../qtcoap.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtmqtt"] depends = qtbase qtdeclarative qttools path = qtmqtt url = ../qtmqtt.git branch = 6.1 - status = additionalLibrary + status = addon [submodule "qtopcua"] depends = qtbase qtdeclarative qtquickcontrols2 qttools path = qtopcua url = ../qtopcua.git branch = 6.1 - status = additionalLibrary + status = addon |