aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-07-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4314ca80f344975b9cb01dbd7d26a2b66149f8d8 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-07-222-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3026b396baf1de58d44335c72d94fa42ef11e2ae Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-07-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30e47f20800449cf0e808dc467f88c56a106a7ee Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-07-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I982d2416a488f18dc672089e9618db04422cf49f Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Remove "-DBUILD_TESTING=OFF" from default configsJędrzej Nowacki2019-07-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not needed. QtBase build instructions add it explicitly, as the tests are build with a separate cmake call (to compile tests against differently installed Qt). Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Do not specify compiler binary name directlyJędrzej Nowacki2019-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a code that handles that implicitly so it is not needed anymore. Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-06-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic264dee2452ffc8b58609f5114444b49488d951b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-06-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia666fc2c946e00b901bd225e06c455474591f7f1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-06-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5266aa8146f6d870fdddedc106d7ef1add5d5c6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Remove DisableTests in featuresLiang Qi2019-06-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least we can get tests built now. Change-Id: I7830f495002083023651ca5da3c6c39e745f920f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Move ICC compiler name setup to instructions levelJędrzej Nowacki2019-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we can simplify product level configuration. Change-Id: Ib855c1873d3b4566b437845ab18182a0db8e45b9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Enable freetype on the Windows buildSimon Hausmann2019-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the newer vcpkg this works now. Change-Id: I8408041b338ffbe74aaec9afbb1cf8cbf3bb1d92 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update vcpkg installationSimon Hausmann2019-06-212-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the latest snapshot, fetch the package set from the repo itself and set the VCPKG_ROOT environment variable as that's the vcpkg documented interface. The qt specific triplet defaults to static linkage, which allows removing the %PATH% handling and resembles the same setup as in Qt 5 where we linked the 3rd-party code statically into qt. Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Qt Submodule Update Bot2019-06-202-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If09d644bb84c83a515a68bada24ab0203a6c6003 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update qtbase on 'wip/cmake' in qt5Liang Qi2019-06-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe0281f5558efb8e0c1f00b17af367173331e30a Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Increase CI test coverage by changing GCC to ICCJędrzej Nowacki2019-06-172-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is already other place in which we compile with GCC on Linux. As we use ninja now, it has to be installed on open suse too. Cmake port depends on system libraries therefore pcre2 needs to be installed. Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Add a new Linux config that builds a static developer buildAlexandru Croitor2019-06-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e40ed674cf0a72223a0180296db8eaa6eb6da06 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Enable windows and macOS builds for yaml and cmakeLiang Qi2019-06-121-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Update cmake sha1 for WindowsJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It amends a6d159c9e714a6b743ae13b96e2ebcd241c50a01. Seems that I computed sha1 for a wrong file. Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Bump cmake to 3.15-rc1 on WindowsJędrzej Nowacki2019-06-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as for the recent Linux and macOS change. Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Fix provisioning of cmake on macOSJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script contains a bit of data duplication, one of the fields was not updated. This amends 463235a0bcdf42ece5be2d0b27dfb81cb46d5dfb. Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Fix paths when installing cmake on macOSJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ammends d44a7a5f145ebdd49e09da358850d102f089c0df. Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Fix path to cmake installation scriptSimon Hausmann2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends commit d44a7a5f145ebdd49e09da358850d102f089c0df Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Bump cmake to 3.15-rc1Simon Hausmann2019-06-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as for the recent Linux change. Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Install cmake from binaries instead of from sourceSimon Hausmann2019-06-052-73/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The from-source installation originates from a point in time where there was no cmake release with binaries that were sufficient. That is not the case with 3.15-rc1. Change-Id: I385016969f21c194b25334e3af8af7283fc5873f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Upgrade CMake to 3.15.0-rc1Jean-Michaël Celerier2019-06-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I374631637a6521621dfa702aa2390998ef124d24 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Provisioning: Add ninja to the list of installed packagesLiang Qi2019-05-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I018e7812fc95c1db841720294a700a391246251d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Move some configure arguments to qtbase instructionsJędrzej Nowacki2019-05-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These arguments are specific to the build and changes to them are _not_ affecting configuration. Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Use yaml configuration file for cmake supportLiang Qi2019-05-208-45/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is needed by new coin to support cmake build as only there configuration arguments are separated from features. Change-Id: I960ec693f80803fd86de472efc953a38358ae14e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Liang Qi2019-05-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I437150950324ad3734ad895b6cbc4ad7bf6139a1 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: install vcpkg and some packages on Windows 10Liang Qi2019-05-032-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: install latest cmake - 3.14.1 on WindowsLiang Qi2019-05-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I461589be02c26e048d5975d59600376022d728fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: Add Windows 10+MSVC2017 to test cmake buildLiang Qi2019-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: Add freetype to the list of installed packages on macOSLiang Qi2019-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: Add pcre2 to the list of installed packagesLiang Qi2019-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on macOS. Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: build cmake from source on macOS 10.13Liang Qi2019-05-032-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Add macOS 10.13 to test cmake buildLiang Qi2019-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Update submodules on 'wip/cmake' in qt5Liang Qi2019-05-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only needed for qtbase though. Change-Id: Ib3fdd44c2804139795fc1efc192e05d227f8b8dc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-05-03105-410/+611
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtbase.txt Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
| * | | | | Provisioning: Add pcre2 to the list of installed packagesLiang Qi2019-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on Linux. Change-Id: I47ba758e86e110c33f9e2bc7607ff9352892470a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Provisioning: build cmake from sourceLiang Qi2019-03-153-5/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Add double-conversion to the list of installed packagesSimon Hausmann2019-03-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on Linux. Change-Id: I910a3e17ec4d6c10ad4e1a9dfc31d1340fe110de Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | | Cmake: install latest 3.14.0-rc3 packages on LinuxLiang Qi2019-03-131-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d88ac6c9180c24538de7c386d026f2d6547ccf4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | | Shrink build configurations and modulesSimon Hausmann2019-03-134-95/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change disables all modules except qtbase from the build and also reduces the build to one configuration. This is not intended to be merged back to qt5/dev but rather a starting point to build up cmake builds in the CI platform by platform and module by module. Change-Id: I899da885dacb32188a0d02b2301df3d4450c0589 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | | | | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2019-12-065-19/+19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | Change-Id: Ia67f4be8c51a2bd0a8a03cb3857dfd57d7eea806
| * | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-051-6/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
| | * | | | | Tag the docker images as "latest"Dimitrios Apostolou2019-12-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will use this tag in qtbase to refer to the image to run, because with the current sha1tree() tag, every minor change in the docker images requires synchronized changes between repositories. Task-number: QTBUG-79867 Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | | | | | Provisioning: Install libpopplerHeikki Halmet2019-12-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Poppler test requires this package Task-number: QTQAINFRA-3253 Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-023-13/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4dd840681bd84f7aeed58602b0c998c0e5807e10
| | * | | | | Update submodules on '5.14' in qt/qt5Qt Submodule Update Bot2019-12-0112-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a09d7b24e5feb97ec891f0a92d35b12dcebde91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 13:42:05 +0000