diff options
| -rw-r--r-- | .gitmodules | 80 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 8 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcharts | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebengine | 0 |
11 files changed, 47 insertions, 41 deletions
diff --git a/.gitmodules b/.gitmodules index 3d8128eb..9aa9576a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.10 + branch = 5.10.1 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.10 + branch = 5.10.1 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.10 + branch = 5.10.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.10 + branch = 5.10.1 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.10 + branch = 5.10.1 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.10 + branch = 5.10.1 status = preview diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 9ff1ec6c..b2057b21 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -94,4 +94,10 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i # Set QEMU font configuration variables -SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" +qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE" +qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH" + +# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173) +qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1" + +SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" diff --git a/qt3d b/qt3d -Subproject 04afcf1cb9e79697360baa01a97a26815237eba +Subproject 30abe028f9a95fa32fbb77cb60063d062e13f7f diff --git a/qtbase b/qtbase -Subproject 28cf5ae000de36cd6ad0df942c2f99bfa7e2212 +Subproject 15ae7949661c6d7f401c83af5bdbb63a2ec46a2 diff --git a/qtcharts b/qtcharts -Subproject b830bb006a7d8c27cc019b6737c669e96098bc3 +Subproject 47f3f659d2c4bae874f78998aece8145605bfd5 diff --git a/qtdeclarative b/qtdeclarative -Subproject 6fe4c1f2803abac74da152b9a5656eff2d71dce +Subproject 2e65f6c2a5d84f4369245cabdc03eca4c19851f diff --git a/qtlocation b/qtlocation -Subproject b9d4da55cf0b775467df43c1d868dc4d58b96b4 +Subproject 518633da419d6cfaf603773b9e8c5840e783bc4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject a5aa09dfd7e42f38545fe4640b0fa251bdd32be +Subproject efc5564c19f3b15eb9a7b0022d201c866a9cf21 diff --git a/qttools b/qttools -Subproject fb16802edcbf8feeecd6a4f760888852aafd117 +Subproject 3c7675d9609a15bea81884560920bded736f79a diff --git a/qtwayland b/qtwayland -Subproject b67d79067515c3f34a8b84fee9fef8484fbdad7 +Subproject 06230d22488796d92ea130e985d1e0ee2ed0519 diff --git a/qtwebengine b/qtwebengine -Subproject 75c40c1799db3ba3919d5288c4f861585dc4a63 +Subproject 47a5d4d100f9ac84ef089db5de102ab4001ed80 |