diff options
-rw-r--r-- | .gitmodules | 80 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 5 | ||||
m--------- | qt3d | 0 | ||||
m--------- | qtactiveqt | 0 | ||||
m--------- | qtandroidextras | 0 | ||||
m--------- | qtbase | 0 | ||||
m--------- | qtcanvas3d | 0 | ||||
m--------- | qtcharts | 0 | ||||
m--------- | qtconnectivity | 0 | ||||
m--------- | qtdeclarative | 0 | ||||
m--------- | qtdoc | 0 | ||||
m--------- | qtimageformats | 0 | ||||
m--------- | qtlocation | 0 | ||||
m--------- | qtmultimedia | 0 | ||||
m--------- | qtquickcontrols | 0 | ||||
m--------- | qtquickcontrols2 | 0 | ||||
m--------- | qtremoteobjects | 0 | ||||
m--------- | qtrepotools | 0 | ||||
m--------- | qtsensors | 0 | ||||
m--------- | qttools | 0 | ||||
m--------- | qtvirtualkeyboard | 0 | ||||
m--------- | qtwayland | 0 | ||||
m--------- | qtwebchannel | 0 | ||||
m--------- | qtwebengine | 0 | ||||
m--------- | qtwebsockets | 0 | ||||
m--------- | qtxmlpatterns | 0 |
26 files changed, 45 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules index eeba9f34..bd5a2734 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = dev status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = dev status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = dev status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = dev status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = dev status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = dev status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = dev status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = dev status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = dev status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = dev status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = dev status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = dev status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = dev status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = dev status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = dev status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = dev status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = dev status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = dev status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = dev status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = dev status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = dev status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = dev status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = dev status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = dev status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = dev status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = dev status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = dev status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = dev status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = dev status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = dev status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = dev status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = dev status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = dev status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = dev status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = dev status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = dev status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = dev status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = dev status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = dev status = preview diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index ff2f1dac..eb0361b3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -143,6 +143,11 @@ installPackages+=(virtualbox) installPackages+=(dkms) # Needed for qtspeech installPackages+=(libspeechd-dev) +# Needed for b2qt +installPackages+=(git-lfs) +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) echo "Installing packages" waitLoop diff --git a/qt3d b/qt3d -Subproject 27457f50b35b3941db4e7e5def742fcdefe218f +Subproject 77e418fde850c86e39d9dd8528876599fbe9dc3 diff --git a/qtactiveqt b/qtactiveqt -Subproject 37edb4464e5f05d239cff4e53c5552fc851960a +Subproject 83ae00d459930a481c412d9ed89f599a4da06ae diff --git a/qtandroidextras b/qtandroidextras -Subproject e72bba4352a2c366887483a4d9ee5afd97589c0 +Subproject 6711472d14d8f675160d559978acee96c1fb25c diff --git a/qtbase b/qtbase -Subproject 42a68ee9dd53eac2d8aaabf02dcf4ffa4525fac +Subproject fb63d912e7f68e149c63a10f7cc2e14a840cb8e diff --git a/qtcanvas3d b/qtcanvas3d -Subproject fb5394ce6d38d06c13b01574cf00d4fe98025c5 +Subproject c2f57acf4134e11d026e2b13b500329f1af750e diff --git a/qtcharts b/qtcharts -Subproject 79888d87ad08ec120fc170c7d450c5ac1067ce8 +Subproject d8e06ed7a08ff841eca61216684519c1cd12f32 diff --git a/qtconnectivity b/qtconnectivity -Subproject 68475e563d8a19f521278703a3e98c7664d6bbb +Subproject 7fbf93d779d1903966bfc894147e0813106ee95 diff --git a/qtdeclarative b/qtdeclarative -Subproject a7472867f407f1226d82aa7bce4cd4d6f9bd652 +Subproject 556907404d9abca53917fc63b2e716987059a2f diff --git a/qtdoc b/qtdoc -Subproject d9e2f412cc6a9149491b7499039ccfe2038a26a +Subproject 889d44825d1d21e15b0a3d10673f5c4157da962 diff --git a/qtimageformats b/qtimageformats -Subproject dd38f75d8614e5d4e1906594e1d83f284af4245 +Subproject 0b4963c26255a5e6c775baf3b6a2adfae0a6d8e diff --git a/qtlocation b/qtlocation -Subproject 3bd2541f84be5200a54c7565074ea22992397c7 +Subproject fb0cacf78d07c95980823dece00d96a5b69d7e3 diff --git a/qtmultimedia b/qtmultimedia -Subproject 35ace9e289dcaada5e0828a59ca7dfee78a6342 +Subproject 72536fa39c71b32f963322a8aa0c1dee320102f diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 07296992462dccf7e4512a829e9e1e5374f4276 +Subproject bcfef3ac8235cafd7accde8b0da0a0e03d3b65c diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject d19f782a887e4a8c87ceee42ad8405a0b12388d +Subproject c80594ada5f9df901779228d13b56679d88a26a diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 854217d60da9ab54795fb39896a053f30122284 +Subproject 5d32b948a5beb80b92c24f04345461892abc3e1 diff --git a/qtrepotools b/qtrepotools -Subproject ddd8ad86da7790ce83640814ee5f1528c4df1fb +Subproject f18687e44b0ea151ab65ac2dacbd752295fc1b0 diff --git a/qtsensors b/qtsensors -Subproject 12bb2552599111aa2f7b6dc69bd0dd565edba71 +Subproject 4cd3730fc17e319fa37796d59a3e1bdf95491b8 diff --git a/qttools b/qttools -Subproject 53094d904447abf2c720dbec1bf8d6e63d53af1 +Subproject e1dee72874fa5845220556985fc11a549eb65fc diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject a046dd2d5486e4805481fd360e486f869d0fa36 +Subproject f51ed61cb1c3a3084cd9bfb42e4560fe8e6e4b2 diff --git a/qtwayland b/qtwayland -Subproject 192b2e8f59e7f0cb3c2d482524bf171a81a213c +Subproject 159db66d5ebd3ada6dd69906b86fd06f0cebaa7 diff --git a/qtwebchannel b/qtwebchannel -Subproject e6c5b44453635be0f05f3ee9545e3cb348e1b1a +Subproject 0880c04eec2653b94ac58f0e20a2215243fd1c6 diff --git a/qtwebengine b/qtwebengine -Subproject 1fde91789de573683eaf1d6b1294eba7757ce11 +Subproject b74e93a9b07243da4f3d2784cde49916de45536 diff --git a/qtwebsockets b/qtwebsockets -Subproject 4321fd13ac58e5bebe4d564431e9c18b627598b +Subproject 3e939546e43ece26d0533fdd01f219e2993ae75 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 8c6e24329ecd65f364654b1ca2b6a273f0826a8 +Subproject ec37df9608ba674c3200e9f23030478018c5023 |