diff options
47 files changed, 55 insertions, 57 deletions
diff --git a/.commit-template b/.commit-template index 26441ac5..aced2afa 100644 --- a/.commit-template +++ b/.commit-template @@ -11,6 +11,7 @@ # # One task per entry. Remember space after colon. #Task-number: +#Coverity-Id: # # ==[ Please wrap at 72 characters ]===================================| # diff --git a/.gitmodules b/.gitmodules index 58692759..625289c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.8 + branch = dev status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.8 + branch = dev status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.8 + branch = dev status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.8 + branch = dev status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.8 + branch = dev status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.8 + branch = dev status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.8 + branch = dev status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.8 + branch = dev status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.8 + branch = dev status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.8 + branch = dev status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.8 + branch = dev status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.8 + branch = dev status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.8 + branch = dev status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative qtsvg path = qtsensors url = ../qtsensors.git - branch = 5.8 + branch = dev status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.8 + branch = dev status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.8 + branch = dev status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.8 + branch = dev status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.8 + branch = dev status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.8 + branch = dev status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.8 + branch = dev status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.8 + branch = dev status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.8 + branch = dev status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.8 + branch = dev status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.8 + branch = dev status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.8 + branch = dev status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.8 + branch = dev status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,94 +226,94 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.8 + branch = dev status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.8 + branch = dev status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.8 + branch = dev status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.8 + branch = dev status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.8 + branch = dev status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.8 + branch = dev status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.8 + branch = dev status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.8 + branch = dev status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.8 + branch = dev status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.8 + branch = dev status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = 5.8 + branch = dev status = preview [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = 5.8 + branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech - branch = 5.8 + branch = dev status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth - branch = 5.8 + branch = dev status = preview diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 58f7967c..be44f77f 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,19 +7,18 @@ qtci-windows-8-x86_64 MSVC2013 qtci-windows-7-x86 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-8-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release -qtci-osx-10.9-x86_64 Clang DeveloperBuild Release QtNamespace NoPch -qtci-osx-10.9-x86_64 Clang Release NoFramework +qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch +qtci-osx-10.10-x86_64 Clang Release NoFramework qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Jethro armv7 GCC DisableTests -qtci-linux-Ubuntu-15.04-x86_64 UbuntuTouch_15_04 armv7 GCC Packaging DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 797d62cd..9429c5bd 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,17 +1,12 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-windows-10-x86_64 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-8-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-7-x86 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static - -# target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests diff --git a/coin/platform_configs/qtxmlpatterns.txt b/coin/platform_configs/qtxmlpatterns.txt new file mode 100644 index 00000000..b57c0abc --- /dev/null +++ b/coin/platform_configs/qtxmlpatterns.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh index 7f1cf05b..6b8d59f1 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh @@ -40,8 +40,8 @@ # Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. # Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. +# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-21 API version in Qt 5.9. set -e targetFolder="/opt/android" @@ -50,7 +50,7 @@ baseUrl="http://ci-files01-hki.ci.local/input/android" # SDK sdkVersion="android-sdk_r24.4.1-linux.tgz" sdkBuildToolsVersion="23.0.3" -sdkApiLevel="android-18" +sdkApiLevel="android-21" sdkUrl="$baseUrl/$sdkVersion" sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" sdkTargetFile="$targetFolder/$sdkVersion" diff --git a/qt3d b/qt3d -Subproject 8ec785d21c13ed0a8d375ff13bf06bea1deb11a +Subproject 7e6d78e2cc647f1fe1a66a9350e6a39574212e7 diff --git a/qtactiveqt b/qtactiveqt -Subproject 1ef04fedc0230450a8588bcb2ac6069693a0336 +Subproject c550735ebeb937a36b82c161f0fed4e35b8776b diff --git a/qtandroidextras b/qtandroidextras -Subproject d94fb02a55705ba913fcf4f871528ea8aee52ea +Subproject 3c6d1f97c0b17f572ae569ad56360cca68fe23c diff --git a/qtbase b/qtbase -Subproject 02cc57f4edbae450ecfa8368052afa44f8aeee1 +Subproject 7dc88b68904c7f1b7e012bd65ccdcbf48cc6e2e diff --git a/qtcanvas3d b/qtcanvas3d -Subproject a50cb9128477474932fc5761e30226582deaf6b +Subproject a693bff7bc33145f918e8e1f160ab26cad55104 diff --git a/qtcharts b/qtcharts -Subproject ac91bf7984291f46619415213ce089a33fc3e59 +Subproject 1fea2116072f96a86daec092e54fe658651a403 diff --git a/qtconnectivity b/qtconnectivity -Subproject 468e3c38a893b9293a9f0ede432ce54d72b4696 +Subproject 9ee0c3c36b039367bcac3e2bc116a97efcbc3d3 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject beb420e3995010b5729608922022e65558f5876 +Subproject f03ed59a582d2bf689c866f195224bf659a7bc4 diff --git a/qtdeclarative b/qtdeclarative -Subproject e0c119ccd4ca49b6fecb708133bb0d300890356 +Subproject 94f6071b8a36501d9da516f2bf0f251147c8b93 diff --git a/qtdoc b/qtdoc -Subproject ff5455912a1a8e40ce9edc731c6c5dcf3a7d9a8 +Subproject 7a2df73f8ba5c0a8eef9bd08daf86ef449bc567 diff --git a/qtgamepad b/qtgamepad -Subproject 72be0422f98cdcfa09b7aa019ce51ac473569db +Subproject bada2f466aff5faeae6239038cba227ea9636d1 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 8e1f0ecad3fdb93b80663ea3fad7013eeb42450 +Subproject 574f6c73a967ec9ec497534e35f442ef327c25b diff --git a/qtimageformats b/qtimageformats -Subproject 8f045f413e935ef9e7fdcef55c52343686a0f1a +Subproject e349e6df7a08b4aa15a63fa5f1dcd0f36d598d5 diff --git a/qtlocation b/qtlocation -Subproject 8cbfb416c6cb1f60a7035d810f3ed68d3aae7ba +Subproject 93cd42ef606178261e12eeffc88cd4b7d029dbc diff --git a/qtmacextras b/qtmacextras -Subproject 56ca83adf83cecd3b81425973d3bb65715719b8 +Subproject 3d975119f95173ce7ed2a29277cf1aa575bc31a diff --git a/qtmultimedia b/qtmultimedia -Subproject e5ee1e036eaecb91797cbe85ac7f8929145f3d6 +Subproject 7e48870c182e66a8408bbcb4c9469d751a777da diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 1f5d0bbcf5a581a67aad97564fb696f18046296 +Subproject 279adce9bb578749161899bfe82cfb6c8b9b6f0 diff --git a/qtpurchasing b/qtpurchasing -Subproject 10902d9809e1df9be58d7408c0aceeef8a621b2 +Subproject d11d69a2dd46a49d244b9611ee6e0e22bb2a1f9 diff --git a/qtquick1 b/qtquick1 -Subproject 64faeb0d8003e699a4d09e7dcee1ef6eb10302a +Subproject 92c847e56d94c9032f3fa83922742e455233e4f diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 27da25e24ed44008f7ba303bb7fe8291aa43fd1 +Subproject ff2c10d287aa9f9726ceee91543f08ab1f9d0b9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject f0ce8b847e2169ad4ae884dbb35b58e6dd0f185 +Subproject bb2a6c61777e2500fa00710c8bb752fa7b99f07 diff --git a/qtscript b/qtscript -Subproject d9d0f0fb7857b71c04f6ff8c30e3092a57af1ef +Subproject 508514b50737c8b854f1b8932a933ef1a24debb diff --git a/qtscxml b/qtscxml -Subproject c575eb524bc26fc4af3711d634110c226c9e11c +Subproject 4b4e81398bdfcda23a9e3c86a297e12b2ff1e9d diff --git a/qtsensors b/qtsensors -Subproject 1b88049661176d149fa75bfdc349cf5b7acb21b +Subproject 993ab0bd1d573f0bbab6e3fcd08d25bc4f32a3d diff --git a/qtserialbus b/qtserialbus -Subproject aef65fb80fc60909ac5141f2df1f9918f964528 +Subproject fa979925d9afa58aab29a57f4289c0b679ac03e diff --git a/qtserialport b/qtserialport -Subproject 86683c445aa61d23af5c06f4e4b45c1d4c80a5b +Subproject 23902340662f1ef6f5dafe68a34b593aed6ea49 diff --git a/qtspeech b/qtspeech -Subproject 9bfe64fddcc528e9aa27b33a17e1435f46ec620 +Subproject 43fed1e8fa150ce9441281ad1891e9f2029b6d5 diff --git a/qtsvg b/qtsvg -Subproject 9778bdd27ce04b92824abfc1bb54b21f1086a2f +Subproject 4bd5d6ced07d2d0e643a13e7cebb228c521d204 diff --git a/qttools b/qttools -Subproject 7bb45dc5318c4c84d94ff35400616eee8e7f741 +Subproject 2f2b7155b5e4cb56c7dc284e203e8e15147e4b2 diff --git a/qttranslations b/qttranslations -Subproject c7d1706b512649b4037421aa8f0c119efd23c93 +Subproject 40e18a92fe3b704735a1fa1512f5b273dedf910 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 5fe45f3bf60961519b89950e4a91aa14251499f +Subproject 0371486a32a0e39cdc9d04f9d1245b214d269e3 diff --git a/qtwayland b/qtwayland -Subproject df015bd2e40e7654b2515996d5bd82469542581 +Subproject e26696524ceb58f4fe0cb7202d873240b6a9478 diff --git a/qtwebchannel b/qtwebchannel -Subproject 031d8d8b1c150f464fc29f7c7a296d257b19797 +Subproject 1cbc05a6568db5e0ff094f8e09723c607ade88a diff --git a/qtwebengine b/qtwebengine -Subproject 35c38346e65fe26c75bbe08c7002f645ea53fec +Subproject c2447a308882ba3691d66b2c28df197f571518c diff --git a/qtwebkit b/qtwebkit -Subproject 7c0824348f93947c946a42999afd8b5dd329c51 +Subproject 37f9c3ea771ce340e1d0e474930798a3c188055 diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject ac8c2122bba9e2ba8887fb5586ca4a8a119cc40 +Subproject c858361fb202c201f8c45e2072d913dc7f31ec8 diff --git a/qtwebsockets b/qtwebsockets -Subproject 83a05bbdc5d87246ec089f855545b6836c0fdf3 +Subproject a0aec91b676e2b79b8e66091d55d9e128bf2a1d diff --git a/qtwebview b/qtwebview -Subproject 801760d37833f33b0395e610755de9910b65caf +Subproject d7b2a1d245d7f22514c251a424d699bc5bb2c39 diff --git a/qtwinextras b/qtwinextras -Subproject f7239c69779e7c9e612a6b3ddb0ae1479d2bd5c +Subproject 210b31fa48134ace767be47508b9918bcee9a22 diff --git a/qtx11extras b/qtx11extras -Subproject 66191eb5d4f41083919d1fce4f1d4ab15bb1a14 +Subproject b45429fd7eeaf598d78f76a670a892c7d0d02f1 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 2e582640c06facd313d77b34fe40c9db4419eef +Subproject fabf557bb8390a94ff4b5d8688a91ffe4abd17e |