diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-17 11:54:35 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-04-22 11:39:14 +0300 |
| commit | a8a17646ab90bd86a9269e8633b9765f03f70744 (patch) | |
| tree | b6c5ed91dae52e07a027874353ee14f66be20e50 | |
| parent | 4e09a6db79d90db7b2aff1d4448305ec145d3766 (diff) | |
Change all (except qtconnectivity) 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.
qtconnectivity will be changed when QTBUG-92990 is fixed.
Task-number: QTBUG-91796
Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit 55874781a1d66694e4db988403ae66c35041b179)
| -rw-r--r-- | .gitmodules | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/.gitmodules b/.gitmodules index 8651eb10..11ca30b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,7 @@ path = qtactiveqt url = ../qtactiveqt.git branch = dev - status = additionalLibrary + status = addon [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative @@ -77,7 +77,7 @@ path = qtlocation url = ../qtlocation.git branch = dev - status = additionalLibrary + status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative @@ -125,13 +125,13 @@ path = qt3d url = ../qt3d.git branch = dev - status = additionalLibrary + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = dev - status = additionalLibrary + status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -151,13 +151,13 @@ path = qtserialbus url = ../qtserialbus.git branch = dev - status = additionalLibrary + status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git branch = dev - status = additionalLibrary + status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras @@ -182,7 +182,7 @@ path = qtandroidextras url = ../qtandroidextras.git branch = dev - status = additionalLibrary + status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative @@ -238,21 +238,21 @@ path = qtcharts url = ../qtcharts.git branch = dev - status = additionalLibrary + status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git branch = dev - status = additionalLibrary + status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev - status = additionalLibrary + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative @@ -265,7 +265,7 @@ path = qtscxml url = ../qtscxml.git branch = dev - status = additionalLibrary + status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia @@ -278,7 +278,7 @@ path = qtnetworkauth url = ../qtnetworkauth.git branch = dev - status = additionalLibrary + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative @@ -298,7 +298,7 @@ path = qtlottie url = ../qtlottie.git branch = dev - status = additionalLibrary + status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline @@ -328,16 +328,16 @@ path = qtcoap url = ../qtcoap.git branch = dev - status = additionalLibrary + status = addon [submodule "qtmqtt"] depends = qtbase qtdeclarative qttools path = qtmqtt url = ../qtmqtt.git branch = dev - status = additionalLibrary + status = addon [submodule "qtopcua"] depends = qtbase qtdeclarative qtquickcontrols2 qttools path = qtopcua url = ../qtopcua.git branch = dev - status = additionalLibrary + status = addon |