diff options
| m--------- | qlalr | 0 | ||||
| -rw-r--r-- | qt.pro | 5 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtdocgallery | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtjsondb | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpim | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtrepotools | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qtsystems | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
34 files changed, 4 insertions, 1 deletions
diff --git a/qlalr b/qlalr -Subproject a803a5c2142cd93a33ab5d3e549d794b1096bf0 +Subproject 4071d86e82b299f26e335a7faf662b5a676e227 @@ -54,6 +54,9 @@ defineTest(addModule) { # users responsibility to ensure that all needed dependencies exist, or # it may not build. +ANDROID_EXTRAS = +android: ANDROID_EXTRAS = qtandroidextras + addModule(qtbase) addModule(qtandroidextras, qtbase) addModule(qtmacextras, qtbase) @@ -71,7 +74,7 @@ addModule(qtjsondb, qtdeclarative) addModule(qtsystems, qtbase, qtdeclarative) addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia) addModule(qtsensors, qtbase, qtdeclarative) -addModule(qtconnectivity, qtbase, qtdeclarative) +addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative) addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative, qtjsondb) addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro) diff --git a/qt3d b/qt3d -Subproject 9a4f9f3eca02c8a6a76e5659920a984ff032d2d +Subproject d3338a9f7fcac109d7bc7f600d5974ff333782a diff --git a/qtactiveqt b/qtactiveqt -Subproject 4c9ff9aee8d235f7bf2a7c996682ead00434034 +Subproject 5173ee755e9d90c44b748f57090c0df8cf9a79d diff --git a/qtandroidextras b/qtandroidextras -Subproject 39f11255247335531430ca129123f651e60ccd7 +Subproject b584c8fa7390dd047ce29c4a2a69190ccbb17d4 diff --git a/qtbase b/qtbase -Subproject e4b94dd19cccd769f8326df20556a8900e7cfb3 +Subproject 20a03d5612a5a7b763bfb0edbf9922ec4e50b25 diff --git a/qtconnectivity b/qtconnectivity -Subproject 1f33f347fad40f71fa89110c084880a81db1d15 +Subproject c0e4db036dfecc4216ca28b4af609ba940b53d0 diff --git a/qtdeclarative b/qtdeclarative -Subproject 4c5cd2f04fdaf946cc67896db7c190a318811d8 +Subproject cb2ac154273a8c07a1e4a14246ae22f6e0deaed diff --git a/qtdoc b/qtdoc -Subproject 34220f073f3df08769a2874cd6f86562ceb1816 +Subproject f6946ef741d44b2e6a959368716f20c40e30703 diff --git a/qtdocgallery b/qtdocgallery -Subproject 870b170354688ae634f620c34ad3ad8aba347dd +Subproject b3803fe8217e85de7c2c7bc4d4fb61df5f84521 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject a65e88aa4eeccb3e6e3d1888d5e2e866487c851 +Subproject 713e1b66e35e08bd05b5ed0684665d068366ff7 diff --git a/qtimageformats b/qtimageformats -Subproject dde6daeccdf0a3f8d49fe1777b49046576b1221 +Subproject a9d13d79298ec7f7c7f69fb38f97b0f48ca4532 diff --git a/qtjsondb b/qtjsondb -Subproject 4497f2a75480df320cd78680d26971bba42e742 +Subproject 58223ab8aaafe3d313863a9b757e9c9bd624376 diff --git a/qtlocation b/qtlocation -Subproject ca0ff22144a54215bc25dfe6f4d3a7fa18c6e92 +Subproject d4b1cfc2e9345f25b0669bb225d05b04bb3fc72 diff --git a/qtmacextras b/qtmacextras -Subproject 39ccd598cd36b01e3b876f55030c639a9bc3968 +Subproject 1490a408c4a360b92bf993e8a4c56cf96acd603 diff --git a/qtmultimedia b/qtmultimedia -Subproject 60fb11d9a2f5ff659a6ccffe01b4de16c1fb592 +Subproject d2545bd40f0a4150f616f52b9138a34c60ed2d3 diff --git a/qtpim b/qtpim -Subproject 902c55a228ea391d60b4493735741e29d01eed7 +Subproject b9d5f9417cd7bb1e25b6ec7819d9997de6c03da diff --git a/qtqa b/qtqa -Subproject 1de258a2adc3421159075d38da4efb3b3df02f9 +Subproject 38a26e6605270e801c2ede6e026f7591cdc3200 diff --git a/qtquick1 b/qtquick1 -Subproject 281d54501ebf7088459354037b02746a7c77f3b +Subproject affc5f7b3b6575974ceab1928f30851981d356a diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 66e1e0fee78f2b0a4412927ad39df4be564d15d +Subproject f096d8925aae9e0485b250c65585368fb6384a4 diff --git a/qtrepotools b/qtrepotools -Subproject 0f80e8a8fa001d0e36b313ae4b8696eadd594a5 +Subproject d8858f6602714824f8e2c2f665ff8c77d290952 diff --git a/qtscript b/qtscript -Subproject f89d64ca722acf4a1a38c5e136bb01eff252597 +Subproject 2e049836ee16f4aedbe7ccc3335fc5785272571 diff --git a/qtsensors b/qtsensors -Subproject 9a8319a39a06d6cf3163978301d650b8f3558c6 +Subproject 51f84fc743112801168b1d5cbb1632c384de565 diff --git a/qtserialport b/qtserialport -Subproject 2a83fbd6c70032d236bbdf0d87aaf51908cd5af +Subproject 8e92374dc2cd48248be107ae48528a3c4330718 diff --git a/qtsvg b/qtsvg -Subproject ae68091e0d6023410bc657cf54e7fa9b6c8bbcc +Subproject 7ebe6263c14ad517c73d0c082fc3e962364b875 diff --git a/qtsystems b/qtsystems -Subproject 5084080c6235989f8165321e0cad8449f574d99 +Subproject f632aee809fed2e96c7f4ed598ed7615a008d9b diff --git a/qttools b/qttools -Subproject 2c5999a3e3d3d612863eb3f99702634a5cc83ff +Subproject 0378cdb823631234f5d91ac8e0150dfb738aa1c diff --git a/qttranslations b/qttranslations -Subproject 0f83fe6f0f802fe799f178c5c61e141b39f78a4 +Subproject c6ceef8480c4282e906f771b6664f87db4a89b2 diff --git a/qtwayland b/qtwayland -Subproject af551d0e4f2c6708ff5aef6e758a39525877b1e +Subproject 0f239080709b5f0e705fcfe708c1a356524d5ef diff --git a/qtwebkit b/qtwebkit -Subproject 231d3a189afaa061dae71c8e939e59c0e120db4 +Subproject e11b03f3edbc713f7249b161be4b9610a9542da diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject cb8ed9694b850a429a93490beaa6462d9f3b8ea +Subproject 481c8b56afe566214503c45046cb83a2ca46920 diff --git a/qtwinextras b/qtwinextras -Subproject 8bbc4f8bc92808cea219698d61a669ce20bdf6e +Subproject 481b20dbdc1aa98525ade7609aaf1b13dad115f diff --git a/qtx11extras b/qtx11extras -Subproject dd7eec92e7a5f4383783cc161f638867572dc20 +Subproject dc452d0b83229ea8eb518b363d1402bda62ecbc diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject ecf06489d90385cf2ca67dc5f70529f76421bea +Subproject ec28b7a1d2e2f0f6eec3a272ff86d1de494b218 |