diff options
46 files changed, 49 insertions, 66 deletions
diff --git a/.gitmodules b/.gitmodules index f6948954..9c017725 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.14 + branch = 5.15 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.14 + branch = 5.15 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.14 + branch = 5.15 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.14 + branch = 5.15 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.14 + branch = 5.15 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,98 +229,98 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.14 - status = preview + branch = 5.15 + status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 5.14 - status = preview + branch = 5.15 + status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git - branch = 5.14 - status = preview + branch = 5.15 + status = addon diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1206bf14..969decee 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -58,12 +58,7 @@ Configurations: - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' @@ -94,7 +89,7 @@ Configurations: Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' @@ -117,20 +112,6 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' - - Template: 'qtci-macos-10.14-x86_64' - Target os: 'TvOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' -- - Template: 'qtci-macos-10.14-x86_64' - Target os: 'WatchOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' -- Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' Target arch: 'multi' 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 89b1eb7f..d5f9ef7a 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 @@ -169,6 +169,8 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for Poppler test in QtWebEngine +installPackages+=(libpoppler-cpp-dev) echo "Running update for apt" waitLoop diff --git a/qt3d b/qt3d -Subproject 648b7459e8a6ce8ce1f115a14da63d546b74343 +Subproject 26df8a284b745002f067cbde6da40fcdb921c19 diff --git a/qtactiveqt b/qtactiveqt -Subproject 6ae4d9b39285d84dad731893444f7027945900f +Subproject 34d89d9b72198f0e0f085d7445db5709a8a130b diff --git a/qtandroidextras b/qtandroidextras -Subproject 2f0a5a4192fd8ca6d00391c6307973805d23a2f +Subproject f4d122b2912e7bc13c9e076a32a6b5c080aa482 diff --git a/qtbase b/qtbase -Subproject 6b9a1824a4c1e4c773c31db8df6c9bf8c768079 +Subproject 5e83a2eed2dc42a732bd9154bebe8dcb34cd6bb diff --git a/qtcharts b/qtcharts -Subproject e0c9c474989394ba13419d645326f4708f9ff8c +Subproject f63d2a7b46f6639b1606448bc964313b76b2099 diff --git a/qtconnectivity b/qtconnectivity -Subproject f4c68cb2fc894f1ff5a9271637d006095c2274d +Subproject 635ad60e8ead34fc8b0a4bc32ed73618ed04173 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject b255d8923ba5eb8435485c1fab3f8d563ac4837 +Subproject 2dd285bc2852ce7bf6d63dea33996482ad2fcd4 diff --git a/qtdeclarative b/qtdeclarative -Subproject 19cc92d170eaba83812be2abda15348ecfa2f07 +Subproject 229e3220ef521dd4389808fd311ea5ae33ab0ca diff --git a/qtdoc b/qtdoc -Subproject 7aa8db8ef4132a3d2099b63aa11212e9d64e0fe +Subproject f6d4d9848673086e08956f5af280dfc15afec1d diff --git a/qtgamepad b/qtgamepad -Subproject e936e2bf84104668331d7f45d78d22ba190d6fb +Subproject 3c91ce46a69449a0350b63a17c79cd69090ffcc diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject aca14b548477a00028a99d8acf184ec5c6403d9 +Subproject 20f436e045bc4636af6acecfa11478f926d4be4 diff --git a/qtimageformats b/qtimageformats -Subproject 9584748fc6847240fd6b748e6735e91e451b895 +Subproject f422f52fcd7d0d5418d91b24508c3d5338cfd61 diff --git a/qtlocation b/qtlocation -Subproject f813d6af4e41b8b60652265827c0c06deb888f6 +Subproject be7cbed7411d024d178377bd327d5916c80e02a diff --git a/qtlottie b/qtlottie -Subproject 798be5abdb7d6e73288780c9ee03c10550dde07 +Subproject f5cc3184f30c9fa1b81d931430aaa4f6f23267a diff --git a/qtmacextras b/qtmacextras -Subproject 8245e27d9b5e395ddfeebda39cef2b5e1b8c8d5 +Subproject 9f58d3afbf3157bf9dcf3614a530fb8e179f60b diff --git a/qtmultimedia b/qtmultimedia -Subproject e47ed7b88223c42dd20ef86b829061fcc4f1fc3 +Subproject d509b9d8375c1ca7dba6d236a06b6c49011a981 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 5e31c8a64073a3d2d88c23f211f22e719ffcd8a +Subproject de3b06752276e33c80d6a897f57f22f658bd5e0 diff --git a/qtpurchasing b/qtpurchasing -Subproject ae27a573d67e1a7c6041b497592174b306bea6e +Subproject 3ef91292426c4aa56989e843e1c675a7ba6ac1c diff --git a/qtqa b/qtqa -Subproject 975a80fc1f322d3374495db3f3c375af9d0b70d +Subproject 521aee63e9d04c675cd4b5f4fef2c1b00a37eb9 diff --git a/qtquick3d b/qtquick3d -Subproject 7f2cf88309f410246007ee1438faa6abadfa75e +Subproject 8443fe7a6341fc7c2f0324e6f1e559ca9fff785 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject caecffab98cb2c47140579712e5b7bc7f7ce307 +Subproject a7829e1ea20d3734bd78fd2300459aabd747077 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 025f938c1b4676782674d54375e1e4e560e4b6c +Subproject c9260cd940fe9ca0e440b715cbfc13dd046e07b diff --git a/qtquicktimeline b/qtquicktimeline -Subproject 7f05ba0039134598dffa17c2ef3e234b5e27241 +Subproject 649afa13b841cdf8339cfb605ef2ecba8176884 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 9129bbda7b90469e710772cec60f6d6b5e87827 +Subproject 09838389f3b9eaf67ad2e0b02a85a62a63fbfc3 diff --git a/qtscript b/qtscript -Subproject 5eedef9953db0859cf9d13b618ea51a071febe3 +Subproject 47c070072496933909ee1267fb26a6f62b16952 diff --git a/qtscxml b/qtscxml -Subproject 2ac294443a72799c021dcf3513c83fb628f3c19 +Subproject bae669b37d3828eb73e78e7c77f0a5fccf8e315 diff --git a/qtsensors b/qtsensors -Subproject 233d2d083fc1bca05f6b323e5c3dbc222828d13 +Subproject 36276fc529529e795df62dae8278013bb4493c2 diff --git a/qtserialbus b/qtserialbus -Subproject ab6f188bf00a9572804baa7b788536247ce8862 +Subproject 8c2a9138ffb00fdab49ab3ef128e4b1c92eb880 diff --git a/qtserialport b/qtserialport -Subproject 553b62badf129ab36c1beee844a9b39492479e3 +Subproject b30052fa41f6332f20ec440dcdbcd06b41a954f diff --git a/qtspeech b/qtspeech -Subproject c47161c6c4c4b1d3252faf7f3088b526ba78351 +Subproject 451a120ad9dc1ec23e11720691dd3797cd68384 diff --git a/qtsvg b/qtsvg -Subproject d072a505d7ff39d509b9c9e2de8722cd3549b4d +Subproject 07e06c4bbff848b1caf044e9056936c54cd29f4 diff --git a/qttools b/qttools -Subproject a3d82bec9678fda3d8c8b7766e83267142d1ef4 +Subproject 6651813b9b0b372319f51723f63692907d70e78 diff --git a/qttranslations b/qttranslations -Subproject c14fdb76539156836eb3d1c1a3d6b6875550c24 +Subproject 9d7437583d7475aa069ec5aa786fa9c5aa36253 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject cef398f8c2176294dc492d7257c2b3705ec5a6e +Subproject 01d0cb221231adfbddb5cb5c4f3ea6e016bbb3b diff --git a/qtwayland b/qtwayland -Subproject e4e03650dbbc1f98ba90d15364d9c951a7e7506 +Subproject 1ef3ec8cae1f27a15b131f82d6401fd6bb79c9f diff --git a/qtwebchannel b/qtwebchannel -Subproject 9f056f7902350106d992d43cb04a9e2f6b6b299 +Subproject facf59c1eae3958b8c2972c167cede215219c81 diff --git a/qtwebengine b/qtwebengine -Subproject 89b62938c9aeb723b2519053928f979c7e78108 +Subproject c2460147b0ae26d19251068e59b8da8254e697a diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 4ec76380e83b86a9202c4b24a1dc3452eedd937 +Subproject 8152dd60c072e6ff9c48e64bbdaad01dfc2915f diff --git a/qtwebsockets b/qtwebsockets -Subproject 2d10eaba1607f3efaaf3020e4b7c57a31060177 +Subproject 127d475324c2133b8d7e2f4712e71d14fa84c56 diff --git a/qtwebview b/qtwebview -Subproject ebf92b96ee6808f67e62449dc65b3757bf41d9d +Subproject 3de65bf9daf1d0e61300cdfe44d3eca51636d43 diff --git a/qtwinextras b/qtwinextras -Subproject 9beac3cc9bcb1806ad1f8118a70467c122b9e93 +Subproject 067f188d321fb65c8291654ee692ea813ef2fc1 diff --git a/qtx11extras b/qtx11extras -Subproject 57910a8015e05328a9ad412b4d76cc2137a853f +Subproject 8136ffdfe8ec8fe1b005fc5e72d66e0fd160b58 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 95b629b30380be3de92158ad55ba266452d3c94 +Subproject 5b5da71586c8391fd74415ec9241c13489445b2 |