diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 82 | ||||
| -rw-r--r-- | qt.pro | 2 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtcharts | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdatavis3d | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtgamepad | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtnetworkauth | 0 | ||||
| m--------- | qtpurchasing | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtremoteobjects | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtscxml | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialbus | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtspeech | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtvirtualkeyboard | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwebview | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
44 files changed, 44 insertions, 41 deletions
@@ -1,3 +1,4 @@ Makefile .qmake.cache .qmake.super +*.pro.user* diff --git a/.gitmodules b/.gitmodules index 97a74435..d1a6c721 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9.0 + branch = 5.9 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9.0 + branch = 5.9 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9.0 + branch = 5.9 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9.0 + branch = 5.9 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.9.0 + branch = 5.9 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9.0 + branch = 5.9 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9.0 + branch = 5.9 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.9.0 + branch = 5.9 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.9.0 + branch = 5.9 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qt3d"] depends = qtdeclarative recommends = qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9.0 + branch = 5.9 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,14 +226,14 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel @@ -241,86 +241,86 @@ serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git - branch = 5.9.0 + branch = 5.9 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9.0 + branch = 5.9 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9.0 + branch = 5.9 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9.0 + branch = 5.9 status = preview [submodule "qtremoteobjects"] depends = qtbase path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9.0 + branch = 5.9 status = preview @@ -28,6 +28,8 @@ QT_SKIP_MODULES = # This is a bit hacky, but a proper implementation is not worth it. args = $$QMAKE_EXTRA_ARGS +contains(args, -redo): \ + args += $$cat($$OUT_PWD/config.opt, lines) for (ever) { isEmpty(args): break() a = $$take_first(args) diff --git a/qt3d b/qt3d -Subproject f39d0a0c32cc489849a0cd5c2880f6e82422348 +Subproject 76c2f63c2c288774e35fd7257ba2d23df603127 diff --git a/qtactiveqt b/qtactiveqt -Subproject 0dd18e45cc9fafac2091ad699e2f83312446761 +Subproject 0544c2b41fdb0a7d7efc9db701bac561e0edf1f diff --git a/qtandroidextras b/qtandroidextras -Subproject 2c146304f56ffe309ca5e9aa025036b7c3ec3fe +Subproject 3b8c84442801ca8989ceb3e57f027ae5c76137c diff --git a/qtbase b/qtbase -Subproject 31374105940bb15a68683a0ae691e7fe1f9b049 +Subproject 4c346b6e2bfab976bc9b16275b8382aee38aefa diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 116737dc8fa244282dda95a8f13624b66fdb552 +Subproject c16fc5a2d8dbe1ba172347f67101027139af2cf diff --git a/qtcharts b/qtcharts -Subproject de7f741c428febfe3c81a28f955996d2314953f +Subproject a93a38b64497e9b0d313578be8cb685d0a8e345 diff --git a/qtconnectivity b/qtconnectivity -Subproject 8dcbf68e4579e03ea6d2808ac0c670169b59d0d +Subproject ca248e3667f52f951bdd60d923b25a6b8fb4296 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 84490ff75be5acdaeb3fd93900e4ebf7ba8f539 +Subproject 400caf7d7c5df35dab9842bda493db4dc26ded1 diff --git a/qtdeclarative b/qtdeclarative -Subproject 96f6ba5f562073f508cd8569ac354592fdd48f4 +Subproject df30d90eadcd92eebb4bf79f3eb251bc58d25d0 diff --git a/qtdoc b/qtdoc -Subproject c5028bdacabf02c2d2e06872e6fdbfa8f86f840 +Subproject f0278ec6728e09d72eca0a76396463cf04a30d8 diff --git a/qtgamepad b/qtgamepad -Subproject ef8850fee38e2552d535379a8477c9abebdf8bb +Subproject fcffc32b64ea1d01503dafd8e16613d009c8ad3 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject db93af5b2bb49af74fbad6c9cd80bd7010434e7 +Subproject 0b663207d6d1672c6a3ec1f2560ba88255644a3 diff --git a/qtimageformats b/qtimageformats -Subproject 71ccf0dff82835ce7b5aed74c37829afdef44cd +Subproject 91d1265be96d2599cb4559124745488658f290c diff --git a/qtlocation b/qtlocation -Subproject 888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5 +Subproject cc635fed31046c2fac37a1a2c90885efbfed819 diff --git a/qtmacextras b/qtmacextras -Subproject d357b7c1444088959f8d3a21d3be1843cf29347 +Subproject 172ec08c6dee39ecd5038abb2fd97da70cea5a6 diff --git a/qtmultimedia b/qtmultimedia -Subproject 559c305ded730e23505e8b29536a98dc59e2acf +Subproject 6e3d6bf8322efd609d3a3ed33c5101072176ed5 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 86c5036848ad004208803d9d497cfcd08c9623d +Subproject 9c170ef9431f8ceec8d9c474de9d75d8dedaa3b diff --git a/qtpurchasing b/qtpurchasing -Subproject f8d5b7a9355c160fb165e040c17836f43d3b38e +Subproject 2eafdd99af53ea0ea5559ad5cc8079ee52ac9d8 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject dacb91916b202208681471ba764504c7c7d086f +Subproject 97a0a64bf90687be72369532494e485caec1081 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c +Subproject 817372c771910d017735ecdd8d4af03a016e2ba diff --git a/qtremoteobjects b/qtremoteobjects -Subproject ae0b101884b05355e3a7bc06dbca722ad3d08d0 +Subproject 045eb6ddd2dfbdce8429dddabbacf3ea1d89d38 diff --git a/qtscript b/qtscript -Subproject e00ca9b6bec2adf78fd14e02376ecf1b55a93b0 +Subproject ab816ddbfeca2ff6dadca0a31de168f1a5a3f7f diff --git a/qtscxml b/qtscxml -Subproject eff82ac957e051f16f64c287f2dfaec9049bdfc +Subproject 013c2991869989a0957441d4a259462bd07427e diff --git a/qtsensors b/qtsensors -Subproject 0c3c4d01ea34ed98a0d2928662f07b673f00535 +Subproject 3835caabad9bb192e57e37c83af08c580269b9d diff --git a/qtserialbus b/qtserialbus -Subproject 20811e3b004af817e3f02982c755e8b1560b8c3 +Subproject 51c7a948f6910f685dcf7b1a11ab41e57b66c9c diff --git a/qtserialport b/qtserialport -Subproject 687f5a9bd44a45a29d24925f29470c43d6729de +Subproject c0c3fa4c3e5e39f13136b9d846c411c8c0391f5 diff --git a/qtspeech b/qtspeech -Subproject 4103c273e4d4ca4697e9b95c1631b31bef2891f +Subproject 2356e7da0a35065254088534e3638b1c050cc74 diff --git a/qtsvg b/qtsvg -Subproject 4fd787e90c70afbaa168abb3efdb8757ba77f3a +Subproject 932d00559be3479f03f00867184b89e75e5e49a diff --git a/qttools b/qttools -Subproject 88e02bb0a9b97d68a4b270e4ddfb6d0847c702a +Subproject b86216cc4c3a97d21a7b7fac0f0cf0a550d06b0 diff --git a/qttranslations b/qttranslations -Subproject 3e727a890f7856978469ee38ef0619b1b59a8ca +Subproject 5b5101cd863de319e3caf897493a5125c0ff7c7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject bdf61afe76e94ef03da1332c4540646f18f5852 +Subproject 7e02d1495e61630bce83833fc9efc6bf38f9a1f diff --git a/qtwayland b/qtwayland -Subproject f1cf62fa8e9ffa2548c9968906848596f50dbc0 +Subproject e80979756369a19236a9a90ca0bfb0210670b32 diff --git a/qtwebchannel b/qtwebchannel -Subproject 6383f0fc5eec4935697a6d2d2f87b511bbeb678 +Subproject 446978af11ab886d734ca3972dcd73f847df9fb diff --git a/qtwebengine b/qtwebengine -Subproject 73f7be5b2a95eab3dce11caede538eeb7beb71f +Subproject fdbc265de10fe173b0c38e0be4c6e3eed1dc65b diff --git a/qtwebkit b/qtwebkit -Subproject f27089657a207ef8c5c9d27d661d3d12c3af8df +Subproject 821eaaadc9d63d03aca65cf757230b520daaaa7 diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 822426abc77a74752b0ee0da4d0a1c106c4dac2 +Subproject f544b2eec0c18b7674ac4df629ae98e8cacce5c diff --git a/qtwebsockets b/qtwebsockets -Subproject 1421c3e4ae4213ca18f2f51d5ddb38e22345022 +Subproject 1f00b331dbc7c34ee67dbe266eed1eddc96b07d diff --git a/qtwebview b/qtwebview -Subproject 6e55abf3b6a5f373cd4b649c2318a45c49b4058 +Subproject 5061f216c0cc605852ce16f1b5c24ace0fdc671 diff --git a/qtwinextras b/qtwinextras -Subproject c9fe5755bd18fd2cc6a310b69e1b81bc8ea8981 +Subproject d48526dd4d2bb7a89c177e7cd4a38c3b879b911 diff --git a/qtx11extras b/qtx11extras -Subproject 9e83ff8713c1a3f69ce514bf3e31335194668da +Subproject 8135494205244808fb3a7408df29d877aca88d5 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject c1c3af0ae456247c9bcd30161d51a94c9b38dc5 +Subproject 78b72b574520e2706ff38521f6c78e360cce7c4 |