diff options
| -rw-r--r-- | .gitmodules | 65 | ||||
| -rw-r--r-- | qt.pro | 7 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtdocgallery | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtfeedback | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpim | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 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--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
37 files changed, 39 insertions, 33 deletions
diff --git a/.gitmodules b/.gitmodules index a184119b..c55010ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,52 +1,52 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtsvg"] path = qtsvg url = ../qtsvg.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtdeclarative"] path = qtdeclarative url = ../qtdeclarative.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtactiveqt"] path = qtactiveqt url = ../qtactiveqt.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtscript"] path = qtscript url = ../qtscript.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtmultimedia"] path = qtmultimedia url = ../qtmultimedia.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qttools"] path = qttools url = ../qttools.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtxmlpatterns"] path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qttranslations"] path = qttranslations url = ../qttranslations.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtdoc"] path = qtdoc url = ../qtdoc.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtrepotools"] path = qtrepotools @@ -56,12 +56,12 @@ [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtqa"] path = qtqa @@ -71,12 +71,12 @@ [submodule "qtlocation"] path = qtlocation url = ../qtlocation.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtsensors"] path = qtsensors url = ../qtsensors.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtsystems"] path = qtsystems @@ -97,79 +97,84 @@ [submodule "qtconnectivity"] path = qtconnectivity url = ../qtconnectivity.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qt3d"] path = qt3d url = ../qt3d.git - branch = dev + branch = 5.5 [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtquick1"] path = qtquick1 url = ../qtquick1.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtquickcontrols"] path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtmacextras"] path = qtmacextras url = ../qtmacextras.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git - branch = 1.1 + branch = 1.2 initrepo = true [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtwebchannel"] path = qtwebchannel url = ../qtwebchannel.git - branch = 5.4 + branch = 5.5 initrepo = true [submodule "qtwebengine"] path = qtwebengine url = ../qtwebengine.git - branch = 5.4 + branch = 5.5 + initrepo = true +[submodule "qtcanvas3d"] + path = qtcanvas3d + url = ../qtcanvas3d.git + branch = 5.5 initrepo = true @@ -68,9 +68,8 @@ addModule(qtquickcontrols, qtdeclarative) addModule(qtmultimedia, qtbase, qtdeclarative) addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) -addModule(qt3d, qtdeclarative) addModule(qtsystems, qtbase, qtdeclarative) -addModule(qtlocation, qtbase, qtsystems qtmultimedia) +addModule(qtlocation, qtbase, qtsystems) addModule(qtsensors, qtbase, qtdeclarative) addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative) addModule(qtfeedback, qtdeclarative, qtmultimedia) @@ -81,6 +80,8 @@ addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchanne addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples, qtwebkit qttools) addModule(qtimageformats, qtbase) +addModule(qt3d, qtdeclarative qtimageformats) +addModule(qtcanvas3d, qtdeclarative) addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase, qttools) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) @@ -88,7 +89,7 @@ addModule(qtdocgallery, qtdeclarative) linux:!android: addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) -addModule(qtwebengine, qtquickcontrols, qtwebkit) +addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qt3d b/qt3d -Subproject bdb98baf8253c69949a8c259369203da9ffb269 +Subproject 664b73dd36de6205cc84a219f936dd744a2dc18 diff --git a/qtactiveqt b/qtactiveqt -Subproject a736ef5bab4ed044af3b24edeff0d9178a13914 +Subproject fc8bd008b15f148171614be2a7730b40ff03231 diff --git a/qtandroidextras b/qtandroidextras -Subproject aa69d43037f9dd612af400ff662e0004b1d4d9d +Subproject cf82978ac02114a9e0ea164443c0bb396fc7db0 diff --git a/qtbase b/qtbase -Subproject f90c1860580bcbe6b898ceb86cdd746532470c6 +Subproject e9f30968ad777bc2d7fcd85adc4e9d38d70398d diff --git a/qtcanvas3d b/qtcanvas3d new file mode 160000 +Subproject 916c59c00c7df7c8f0652098462e042daac3048 diff --git a/qtconnectivity b/qtconnectivity -Subproject 90291d71308db90d763e5b42a8f096301ceb966 +Subproject 3264db95f965a47f31ffe1ab768467ce827e41e diff --git a/qtdeclarative b/qtdeclarative -Subproject 1cb329aaaa68ead31c0ae91a69193c7ae08e25b +Subproject 6a50e6f63d46dfed4b1edc6a2a8d49f27ef9695 diff --git a/qtdoc b/qtdoc -Subproject 00e2a32aa89b6051fb4e24561baa030e72291cb +Subproject e2e70692911f32cfea38269bd18603079277e2c diff --git a/qtdocgallery b/qtdocgallery -Subproject aa1d1e75ea4589e6b541a853c11094dd578e2b7 +Subproject 2da36eb615f6f8f06a456d65c45547937b47beb diff --git a/qtenginio b/qtenginio -Subproject 6663228c1c875da566ddf0cfd148700e271db1f +Subproject 16afca15afe8e8c0f69d5e2c42a62bd92477b2e diff --git a/qtfeedback b/qtfeedback -Subproject dea0da72655f1defccaea643dbe37373f669224 +Subproject 862de791d785797a561204c78490f31a318a936 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 6eef4b5fa1836c9cb7ebc5dcb269a8d3114eb6c +Subproject a1897106ce1306c1083bff05493a760e11bd19c diff --git a/qtimageformats b/qtimageformats -Subproject 2c08111f5450876e37730515fce4683da91be35 +Subproject 6aeeadf865d711a67185d06e563d9f63e67c31e diff --git a/qtlocation b/qtlocation -Subproject 4a6807bca5f4452ea7a9d6ed2ff19b8e4259a37 +Subproject c23a10cd2c54799da62078f032e021c2ec0f976 diff --git a/qtmacextras b/qtmacextras -Subproject 78cb91f7143ef1e768c6875475fda243094239b +Subproject 2353df997fee7ec6b99765762f21c925c33a53a diff --git a/qtmultimedia b/qtmultimedia -Subproject 06259f1dfbd9cb2ebd58bba59381a42dc8a758d +Subproject bbfccc713546f9e7341fbe1af7482cafbdc4ea2 diff --git a/qtpim b/qtpim -Subproject 7a2b179ff1cf1bffb378272e2d339bc803700e3 +Subproject 18e3d741c3526978cdacc88bc260d250918d208 diff --git a/qtquick1 b/qtquick1 -Subproject 41119e843f099ce7d80f966cc754324bfe0f063 +Subproject 4b4c6a984b2bcdfcb5a77a024e48072a7aa854e diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 9af9dabe3c88baa87befe5a4591d7f350888830 +Subproject 6f15c206b069ed0fcf48a285bfcc4ad636927df diff --git a/qtscript b/qtscript -Subproject e598c4b5d1121030359cba800a36e40acc4730f +Subproject 6c387974ab827e53d96d9106a44df29584c1e2b diff --git a/qtsensors b/qtsensors -Subproject 4ff25ba156323d9b82e7cddf16eebcb744d0e0c +Subproject 007772e642fc337a97e50f65babb62c52025747 diff --git a/qtserialport b/qtserialport -Subproject b84fe7eb3d6d977a347bfbb82da724409b2eda6 +Subproject d42d5838b9a4c3cbd6b0e67dabce658ba737eba diff --git a/qtsvg b/qtsvg -Subproject 6e44b5bd59915ffe2da1864ab9fd8393890f03b +Subproject 684283ae80a6d844e80ac5f9ce4a816a3766a4f diff --git a/qtsystems b/qtsystems -Subproject 16125b64bf1eb8abdcb4b5e34be51bfa5a850d8 +Subproject 44f70d99a2ecd5f3f320650461f1d69142d11bc diff --git a/qttools b/qttools -Subproject 638c278b76c56a51f83ef8c5cc9c03f18a887f7 +Subproject ef50aeaff84130e9bbab344027cdb78af8a92ca diff --git a/qttranslations b/qttranslations -Subproject 35a64da9fd6fa38e92373798ed17f6cab73586e +Subproject c2c7437f35df9d65e70aaa0314c6f88a851855d diff --git a/qtwayland b/qtwayland -Subproject 8458e06b25c07ebc8cf6b210fc1ea4cc9aeb42e +Subproject e6805407b62c9c57bac488813f77ee5cca71868 diff --git a/qtwebchannel b/qtwebchannel -Subproject 358e5acba3154a8ab4b53b22797c2c1eae4707d +Subproject 9d705911391c456813ce54a52f70aa2ccbc5b55 diff --git a/qtwebengine b/qtwebengine -Subproject 4eceed9ac0b646238e76d77569a619d4dc515ba +Subproject eee482929a81ae9d685a0ee140733227ceac654 diff --git a/qtwebkit b/qtwebkit -Subproject 38ad9239977ac6e66573f5508ce2f030c576093 +Subproject 3a3681158677f319bce88eee75d2696b8231eb1 diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 69a9c9193abe008a9a52640b19a409e4a86c489 +Subproject 10edcf82d3e85fee00b8397d7a21c56a9dfa95e diff --git a/qtwebsockets b/qtwebsockets -Subproject 48f8a0cf237e757d1ef3f8be424f7a1acb915b0 +Subproject bb9c22280afea1687b4c8ac012139f23b29adf5 diff --git a/qtwinextras b/qtwinextras -Subproject cc8f7422dded13eb0922df01e1a04514a06c80e +Subproject 8657988dd4074377a2131dee300ca35004869e3 diff --git a/qtx11extras b/qtx11extras -Subproject bcc86311359e138ecc3a8fc1ce6eee1cda2ec0f +Subproject a9a4e64127a06ca9d1ad7032e521a1181e0412f diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject db784fb1c01ca2a0e7ada2c407cd1aab3aa98fe +Subproject b6d1d402b5b6b9f62f2359578cf1fc9677aea0d |