aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-08-0340-0/+0
| | | | | Change-Id: Ib23bce6910ad849e3dc3d70cbc2fd042071c5c6c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Only update qtserialportTony Sarajärvi2018-08-021-0/+0
| | | | | | | | For a fix on Android. Task-number: QTBUG-69727 Change-Id: Ie7d000dece247678e80c7d7db08c0ac3763bc8a3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix dependencies of the qtdoc moduleSimon Hausmann2018-07-311-1/+1
| | | | | | | | | After commit 01d2f35b6988edacc741b358703d16d4cd8c199a in qtbase, the existing CONFIG+=lrelease in examples/demos/photoviewer/photoviewer.pro now calls lrelease and thus requires qttools. Change-Id: I7cabc70fc6316a49793d7e91a493d8a5e5028295 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Download and cache needed python wheels during provisioningDominik Holland2018-07-316-4/+51
| | | | | | | | | Instead of downloading the packages during the compile/configure step setup a wheel cache folder during the provisioning phase Task-number: AUTOSUITE-195 Change-Id: I465f1be7cdd351e7680dcd8ae22d5e97ddf8cb2d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-266-0/+0
| | | | | Change-Id: Ic321b9e43d8e744049142b01d40728460f5722f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-259-0/+0
| | | | | Change-Id: I0b014bee5ef1621a1dc3c02571ba0aff52d8cf2d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-245-0/+0
| | | | | Change-Id: Ie9f30b588c9f959f049f1f3b0830ac2894f284ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Update cmake to 3.11.3 on macosSimo Fält2018-07-231-5/+5
| | | | | | | | | | It seems that cmake 3.6 had issues with more recent XCode. Since XCode 8 the sysroot folder might have been unversioned (MacOSX10.12.sdk -> MacOSX.sdk). In that case older cmake can't detect correct SDK version. This is causing issues when building Pyside2. Change-Id: I09f0ed4fe6d15ba3d60aa3a6e9a9b3b9091996c8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-232-0/+0
| | | | | Change-Id: Icd056ebc3efef5427b9bfd7ad8fc568855155ad0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-226-0/+0
| | | | | Change-Id: Ic9ee5417a89c9a83e6b65d2b33c3fea37dfc9245 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-213-0/+0
| | | | | Change-Id: Ib375f5182203ae1217586bd95bb3a6e0c47429bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-205-0/+0
| | | | | Change-Id: I46590a04c487498f6118cf17bd06114680e4493c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-1919-0/+0
| | | | | Change-Id: Idccb3051f2d430ff7b353bc1c8aee341d1314d84 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Open62541 win32: Add python to dev environmentMaurice Kalinowski2018-07-181-0/+1
| | | | | | | | | The autodetection of cmake used a different python for x86 builds of msvc. Those did not have six installed. Instead, use one python for all build variants to stay consistent. Change-Id: Id1ad2bc320e47a68358364ff94d78993ba0b0848 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-07-1825-0/+0
| | | | | Change-Id: I93cf04ca1ecec20b61cac9275b719ebd3e76c227 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Simon Hausmann2018-07-121-3/+3
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/5.11' into devSimon Hausmann2018-07-101-3/+3
| |\ | | | | | | | | | Change-Id: I1af773187b7dd55bf820ce7d3218a9f3121c198a
| | * provisioning: Update winrtrunnerOliver Wolff2018-07-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | winrtrunner is from dev. The only change to the previous version is a longer timeout for deployment, as CI runs now and then failed, because deployment did not finish in time. Change-Id: I244e68af447db9298d64bb791048032edd3ec1fd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-07-046-0/+0
| | | | | | | | | | | | | | | Change-Id: I789b8631db8db928a08443bb507b5f18d0e49241 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-07-034-0/+0
| | | | | | | | | | | | | | | Change-Id: Idc7f66cc084706ac4a2bb9a212af764d41301182 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-07-023-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie3dfab4426573c7c9a3312f40cb349cf8b49938f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Docker Provisioning: Install Avahi and enable mDNS service discoveryRyan Chu2018-07-106-15/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The challenge of connecting Docker containers from the host is to resolve a predefined hostname to an IP address assigned at runtime. For Unix-like platforms such as Ubuntu, it can be done by either hard-code the IP addresses or creating a DNS server. Both of them are not user-friendly which need root permission to modify system files. Avahi is a free Zeroconf implementation and provides multicast DNS (mDNS) service discovery. It enables Docker containers to publish their services on a local network. For the host systems supporting mDNS technology, they will automatically discover the services in a local domain without extra user-efforts. Task-number: QTQAINFRA-1686 Change-Id: I1ef464a455cef5d331a3e2eb0194e2741172ef95 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Ryan Chu <ryan.chu@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Provisioning: Update Open62541 install pathMaurice Kalinowski2018-07-041-3/+3
| | | | | | | | | | | | | | | | Use the updated install path for OPEN62541_PREFIX argument in CI. Change-Id: Ifa06d002516da20001a94ff6e7066504fa471a8f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Provisioning: Open62541 Update environment variablesMaurice Kalinowski2018-07-041-1/+1
| | | | | | | | | | | | | | Using CI_OPEN62541_<compiler>_<arch>_PREFIX is more verbose. Change-Id: I58ed0f31935308389f274f93578361db3dc01daa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Provisioning: Install Unified Automation C++ SDK on WindowsMaurice Kalinowski2018-07-042-0/+60
| | | | | | | | | | | | | | | | | | UA C++ SDK is one of the supported OPC UA backends in the Qt OpcUa module. The aim is to have packages available with Qt 5.12. Change-Id: I2d1b3c6c583f4563e7470317d4f73f853bd34c72 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Provisioning: Install Docker-based test servers on Ubuntu 16.04Ryan Chu2018-07-029-0/+337
| | | | | | | | | | | | | | | | | | | | | | | | Build and cache docker images based on the configurations in testserver. 1. Download and install the docker engine and docker-compose extension. 2. Append address and hostname of test servers to CI environment. 3. Build and tag the docker images by the SHA-1 of server context. Task-number: QTQAINFRA-1686 Change-Id: Ib9b58d45856682ddec04af045e1eab18e14a85fb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-0230-759/+1084
|\| | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
| * Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-305-0/+0
| | | | | | | | | | Change-Id: Icb4cd2f6afe9a7aa4c3000a7006471afd141f562 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Remove unused libclang installationsSimon Hausmann2018-06-292-3/+0
| | | | | | | | | | | | | | | | | | We don't need to install the MinGW builds of libclang 6.0 for configurations where the Qt MinGW build can't use them. Task-number: QTBUG-68064 Change-Id: Id9183ccfc15a7a81edb67df371075d584e5cbae8 Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Provisioning: Fetch icu from ci-files01 instead of master.qt.ioHeikki Halmet2018-06-292-16/+25
| | | | | | | | | | Change-Id: Ia27e68cb94ab0744ce11cfa74c90e118c1f0e4b3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: Add force option when unmounting squishHeikki Halmet2018-06-291-8/+13
| | | | | | | | | | | | | | | | | | | | | | Sometimes unmount of squish fail because resource busy even if the installation is already succeeded. To avoid this let's add force option to make sure unmounting works every time. Task-number: QTQAINFRA-1964 Change-Id: Icacd01341d09577d9880e3ed208cb6ea18a7ac4f Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: Refactor libclang installationHeikki Halmet2018-06-299-87/+63
| | | | | | | | | | | | | | | | | | | | Libclang must use cached url (ci-files01-hki) to reduce the download time Libclang release_60 versions were rebuild which requires sha1 changes Task-number: QTQAINFRA-1966 Task-number: QTQAINFRA-2100 Change-Id: Iddf47a2a3a5bc38dbed684320120164bb40c028c Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Update submodules on '5.11' in qt5Liang Qi2018-06-2918-0/+0
| | | | | | | | | | Change-Id: I2d450d444d40d129003461329fa5058ca1c0f140 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Replace commercial preview license with Qt License Agreement 4.0Kai Koehne2018-06-262-628/+913
| | | | | | | | | | | | | | | | | | | | | | | | | | Do allow people to build from git using the Qt License Agreement 4.0. The license agreement text is the same as in the installers, except that some Unicode characters got normalized to their ASCII variants, and things have been properly wrapped. This follows qtbase change 60e56f1679d6. Task-number: QTBUG-52222 Change-Id: Id00d026e47be3bfc488419652d9f53d72d56f0d0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Provisioning: Update MQTT test brokerMaurice Kalinowski2018-06-252-6/+8
| | | | | | | | | | | | Change-Id: Ie4e9ff5c13eb5f882b70e4e948836ae78496dd40 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Liang Qi2018-06-220-0/+0
| |\ | | | | | | | | | Change-Id: I48c80e0162f44a3eca1694d538971ef981d37d2e
| | * Update submodules on '5.11.1' in qt5v5.11.1wip/qt3dstudio/2.0.1wip/qt3d-runtime/2.0.1Qt Submodule Update Bot2018-06-1725-0/+0
| | | | | | | | | | | | | | | Change-Id: I1b1caa12ea3b4e6c36b2051d88ad8492d17d06cf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.11.1' in qt5Qt Submodule Update Bot2018-06-1115-0/+0
| | | | | | | | | | | | | | | Change-Id: Ibc6aaaa9d4de853685695d192495e98d98d81082 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.11.1' in qt5Qt Submodule Update Bot2018-06-081-0/+0
| | | | | | | | | | | | | | | Change-Id: I54afe311c809984962f9644830899e00d1766f96 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Merge remote-tracking branch 'origin/5.11' into 5.11.1Liang Qi2018-06-0812-20/+76
| | |\ | | | | | | | | | | | | Change-Id: I0bfda3a8816684275bd7f63372684cdf3e8b9ac3
| | * | Update submodules on '5.11.1' in qt5Qt Submodule Update Bot2018-06-0840-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia0779127ef3859678ef194b0af2e4fdb5b25d9f5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Adjust submodule branchesOswald Buddenhagen2018-06-011-40/+40
| | | | | | | | | | | | | | | | Change-Id: I9c6e8ecf1798041b1d2524cb80be936b56216e47
| * | | Update submodules on '5.11' in qt5Liang Qi2018-06-2235-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip qtbase and qtwayland in this round. Change-Id: Id405a21fda570ab62588f128536ba77cc01fd080 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Provisioning: Fix downloading from githubMaurice Kalinowski2018-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invoke-WebRequest uses TLS1.0 by default, which is not accepted by Github anymore, causing all downloads from that site to fail. Upgrade to 1.2 to get downloads working again. Change-Id: Ie242432937c273db5c345b38482dd74c19c3b4ca Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| * | | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-0910-0/+0
| | |/ | |/| | | | | | | | | | Change-Id: I3b6197f122aaeca5eb1838db41d3fb864eb4043a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Provisioning: Add 64 bit Mingw to coin as packaging targetSimo Fält2018-06-064-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change will provision DirectX SDK with enabler DotNetFramework also, so that configure for MinGW will detect ANGLE correctly. The DirectX headers and libs will be in two location, while those are installed with MSVC also. Task-number: QTBUG-35288 Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-0618-0/+0
| | | | | | | | | | | | | | | Change-Id: I49fd99ca74e396010e65069e04579daa81b4fab2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-058-0/+0
| | | | | | | | | | | | | | | Change-Id: I01ace9bc6ad2805a7a3cdf5b464357e4bad5dc19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-0240-0/+0
| | | | | | | | | | | | | | | Change-Id: I363b007807ce65746d22ad2e2608aa17c5859deb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Provisioning: Install 32 bit python to 64 bit windowsSimo Fält2018-06-018-20/+43
| |/ | | | | | | | | | | | | | | | | | | | | In order to create 32 bit Pyside wheels we have to be able to link Pyside against 32 bit python. While 32 Qt build is done in 64 bit Windows Pyside must follow. Task-number: PYSIDE-646 Change-Id: I30855d4cecd6bc6219021216e9c296d28c56b405 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>