aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.13' in qt5Liang Qi2019-07-2341-0/+0
| | | | | Change-Id: I5a1af05df086b2ba86dc736714a2eae9db299248 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Liang Qi2019-07-064-86/+61
|\
| * Merge remote-tracking branch 'origin/5.13.0' into 5.13Liang Qi2019-07-054-86/+61
|/| | | | | | | Change-Id: I97c42bef6632a4aeccefab008e0f615f7a9e9f78
| * Fix openssl 1.1 library configurationsv5.13.0-rc3v5.13.0Heikki Halmet2019-06-132-5/+11
| | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit de415914772b5ced911ec9f04738dab2ec355fc9) Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-06-132-0/+0
| | | | | | | | | | | | Change-Id: I8883876f4360b207000d7635838fd26adb6a2f73 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix qt5.git buildsJani Heikkinen2019-06-121-1/+1
| | | | | | | | | | | | | | | | some '-' is missing from qt5.txt causing coin to ignore all configurations from that file. So adding enough '-' in title column to solve the issue. Change-Id: I0b8fa6c98efeece1bf93592bbb60ca627962ceee Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-06-124-0/+0
| | | | | | | | | | Change-Id: I0070b9d562cfb57bab5b6fad913e9dbdf2090b48 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-06-102-0/+0
| | | | | | | | | | | | Change-Id: I499cced655cbac696eb8343c1f01bdf00c7dcc9c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.0' in qt5v5.13.0-rc2Qt Submodule Update Bot2019-06-064-0/+0
| | | | | | | | | | | | | | | | Change-Id: I093500e5ebc9e53766233919eaf66dd223529300 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Disable MySQL from packaging buildsHeikki Halmet2019-06-052-32/+32
| | | | | | | | | | | | | | | | | | We can't link against 3rd party GPL libraries Task-number: QTBUG-76081 Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-06-054-0/+0
| | | | | | | | | | | | Change-Id: Ib895ddc3b6d81039e6661864d03f1c586a78dbba Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.0' in qt5v5.13.0-rc1Qt Submodule Update Bot2019-06-032-0/+0
| | | | | | | | | | | | | | | | Change-Id: Ie903e4f8177b324ec981a1d57e7c2e0b4f76d585 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-05-311-0/+0
| | | | | | | | | | Change-Id: Idc487281a4293ad8cc5ad494b79fd941efc820ce Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-05-275-0/+0
| | | | | | | | | | | | Change-Id: I1d1d7dd6d259b26f0c0216efd1976ac79b500e78 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Install prebuilded OpenSSL 1.1.1b for Windows 7Heikki Halmet2019-05-261-49/+18
| | | | | | | | | | | | Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-07-058-0/+0
| | | | | | | | | | Change-Id: I39a42574427b32d1d5c73ea96713913674ca7303 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.13' in qt5Liang Qi2019-07-0240-0/+0
| | | | | | | | | | | | | | Skip qtbase in this round. Change-Id: I49b70268be1be3d29fca34af87d376dc51154aec Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-254-0/+0
| | | | | | | | | | Change-Id: I40b83973a9cab06f068c8a61f51fded3eddebeef Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Make header line in qtwebkit.txt longer to prevent parsing errorKonstantin Tokarev2019-06-251-1/+1
| | | | | | | | | | | | Change-Id: I0531f91af397d09cfa7eae96c0d779d3055b0456 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-242-0/+0
| | | | | | | | | | Change-Id: I6f19903a3a7cdcf8fb2579b710ccda23427fb91b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update platform_configs for QtWebKitKonstantin Tokarev2019-06-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | * Remove redundant MSVC2017 configuration * Synchronize Mingw73 configuration with qt5.txt Change-Id: I02f6649b77e89b9acb3bdd516419aa12817caaa3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-224-0/+0
| | | | | | | | | | Change-Id: I567e22dba0fc0b4c3dd377aa3d37ba0985855ba1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-2036-0/+0
| | | | | | | | | | | | Change-Id: I62f02ca85e035aa26dc0f9a0ebb4d78e4abc2363 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-195-0/+0
| | | | | | | | | | | | | | Change-Id: Ia2ae5b47bc7e4aa094c6ed72d0a7be3bef090387 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-187-0/+0
| | | | | | | | | | | | Change-Id: I216600c90956b5716b1ce1a787b21417dbc4089a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-176-0/+0
| | | | | | | | | | | | Change-Id: Ifb6609089d41976f649b73df26e9214ab3b49fd4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-146-0/+0
| | | | | | | | | | Change-Id: Id806418087800e313ee9a14c0a99fcf7215579c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-122-0/+0
| | | | | | | | | | | | | | | | Change-Id: I4363311b5e75dd00eb5c869d013b701a2ef7ef49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-116-0/+0
| | | | | | | | | | Change-Id: Ic3abd12e65592ae218e47b96bf5e80ccf92807e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-101-0/+0
| | | | | | | | | | | | Change-Id: I8a94229ad71e5ee71e77bbe27641239f6a6940dc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-091-0/+0
| | | | | | | | | | | | Change-Id: I07ecded02a10f0d0849de89e36569e88c2d0cf8d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-084-0/+0
| | | | | | | | | | | | Change-Id: I4dae0c7ec72588d61f479074307bbe9515aeb895 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-073-0/+0
| | | | | | | | | | | | Change-Id: Id5b714f25384e8b6db9d314d63344440fa459b17 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-063-0/+0
| | | | | | | | | | | | Change-Id: I7bb7197fced3470b41e8d2b77f0af4617607ce97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-06-0512-0/+0
| | | | | | | | | | | | | | Change-Id: Iad275ca3305f834c0ff484df8c6469931fbcb3d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Provisioning: Update QNX 7.0 packagesHeikki Halmet2019-04-243-6/+6
| | | | | | | | | | | | | | | | | | | | | | Updated packages includes QNX Multimedia Suite 2.0, which enables building QtMultimedia QNX plugins Task-number: QTBUG-71073 Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-289-0/+0
| | | | | | | | | | | | | | Change-Id: I43c1b4dac692f6c93702d05d3ee2a2ec224b2736 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Liang Qi2019-05-2721-125/+341
|\ \
| * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Liang Qi2019-05-2721-125/+341
|/| | | |/ | | | | Change-Id: I56973a90b028a77c3692f790648b605622af4af6
| * Add Android x86_64 architecturev5.13.0-beta4Heikki Halmet2019-05-251-0/+3
| | | | | | | | | | | | | | Task-number: QTBUG-47672 Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Provisioning: Change openssl version to 1.1.1bJuha Karjalainen2019-05-2218-125/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-05-236-0/+0
| | | | | | | | | | | | | | | | | | Change-Id: I51a93793234d86494580ec6a9d53b7cd414c888b Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Provision sed for windows 10Juha Karjalainen2019-05-163-0/+73
| | | | | | | | | | | | | | | | | | Sed is needed by webassembly build. Cannot use sed from msys as having msys bin folder in path breaks webassembly build. Task-number: QTQAINFRA-2835 Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * qtdeclarative platform config: Add missing quotesUlf Hermann2019-05-161-1/+1
| | | | | | | | | | Change-Id: Ib8c0a2aad21718dba25728d3ac869c23f314554a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-05-1632-0/+0
| | | | | | | | | | Change-Id: Ibb7ad97a0fb6cbc2d7d8d77d0fd115c1d602ee07 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-244-0/+0
| | | | | | | | | | | | | | Change-Id: I5b52a5c17a612ba62948c01696e71c88bd84e85c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-2118-0/+0
| | | | | | | | | | | | | | | | Change-Id: Icc5ec39c45931aec77ca5287c14d08902ec6c551 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix qtdeclarative boot2qt CI configAllan Sandfeld Jensen2019-05-131-1/+1
| | | | | | | | | | | | | | DISTRO_OPTS was missing quotes. Change-Id: Iffcfce8e34f95b5a0c0f0309b26291b31b12a7dc Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-123-0/+0
| | | | | | | | | | Change-Id: I0e6e46b247198ce68668222e555e3ebf256729bc Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.13.0' into 5.13Liang Qi2019-05-121-1/+0
|\| | | | | | | Change-Id: Ib80ac156ec8ce5690d5ec784c671bd706afe0b4e