summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add conan profiles for Qt 6.0.4 releaseHEADmasterJani Heikkinen2021-04-1212-0/+155
| | | | | | Task-number: QTBUG-92279 Change-Id: I78e05dcb98db4f1b15abdd312978a1931a29e611 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add Qt 6.0.3 profilesJani Heikkinen2021-03-2212-0/+155
| | | | | Change-Id: Ie1248942ee441183285a5c0e4a5bfe68b390e3cc Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Apply *: package filter for 'qt6' optionIikka Eklund2021-03-185-5/+5
| | | | | | | | | | | | | | | | | | The added filter applies the 'qt6' option for those recipes that actually use it. Recipes in the requires chain (dependencies) that do not define that option are not given this option which may cause and error when building the package(s): ERROR: option 'qt6' doesn't exist Possible options are [] The above error is thrown for some reason when consuming a Conan package via 'conanfile.txt', with or without the 'qt6' option. Change-Id: I8078ba13dd54d30c5a87b3d9f592fbf2734b98e4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add Qt 6.0.2 profilesJani Heikkinen2021-02-2512-0/+155
| | | | | Change-Id: Ia37553c16d1c0428bbc88faada6f167092183508 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Qt 6.1.0: Use CONAN_CMAKE_GENERATOR=NinjaIikka Eklund2021-02-158-0/+8
| | | | | | | | | | | Put the CMake generator into profiles and set it to Ninja which should be used by the Add-on builds. This saves the users from having to set it manually before the build. Change-Id: I92cd39c1e9321211c293c69e7743ef6d6b736078 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qt 6.1.0: Use QTDIR in Conan profiles for Qt pathIikka Eklund2021-02-159-9/+9
| | | | | | | | | | | | There's an established environment variable for this: QTDIR. This environment variable is also set by Qt Creator by default. So the Conan recipes should accept this environment variable. Apply this change for upcoming Add-on/Qt releases i.e. 6.1.0 onwards. Task-number: QTBUG-90583 Change-Id: Ib37adaa5dc3ee1945290743bbd1a18bd71f87797 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add initial conan profiles for Qt 6.1.0Jani Heikkinen2021-01-2712-0/+155
| | | | | | Task-number: QTBUG-90262 Change-Id: I8d1b2d97518a96d58bc8043e38ebf48d4290a365 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add 'CONAN_CMAKE_GENERATOR=Ninja' in MSVC2019 conan profilesJani Heikkinen2021-01-262-0/+2
| | | | | | | | | | | | Fixes: QTBUG-90532 Fixes: QTBUG-90527 Fixes: QTBUG-90528 Fixes: QTBUG-90526 Fixes: QTBUG-90524 Fixes: QTBUG-90523 Change-Id: Ibcbc74d2ef470f8123439cfd1e71be6c577273ee Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add conan profiles for Qt 6.0.1Jani Heikkinen2021-01-1212-0/+154
| | | | | Change-Id: I975395b766aef5df833b5d762ffceadc1e9a7090 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Include 'qt6' option in profilesIikka Eklund2020-11-0412-0/+12
| | | | | | | | | | | | | | The 'qt6' option is used to define the Qt version number as an option. This is used by the build recipes to take the Qt version 'dependency' into account when package_id is being calculated. This is needed because there are no 'Qt6 essential' conan packages at the moment. Task-number: QTBUG-87384 Change-Id: I38986e6ca022c5adbd2609474f60d34fe808854c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add Boot2Qt profilesSamuli Piippo2020-10-293-0/+30
| | | | | | | | | | Add generic profiles for different architecture used in Boot2Qt, these need additional -e QT_PATH= argument when used with conan, where QT_PATH points to the host sysroot e.g., <sdk>/6.0.0/Boot2Qt/imx8qmmek/toolchain/sysroots/x86_64-pokysdk-linux/usr Change-Id: I4e3c3b057752a39d00641f253c00f17c3dd65d18 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add Qt 6.0.0 Android profilesIikka Eklund2020-10-284-0/+48
| | | | | | | | | | | | | - arm64_v8a - armv7 - x86_64 - x86 %QT_VERSION_PATH% is patched by the Qt Installer e.g. as '/home/<user>/Qt/6.0.0' Change-Id: I38a1dae47f2e4332dbb076d0e81946bf1ff56e4f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Remove 'os_build' and 'arch_build' from Linux desktop profileIikka Eklund2020-10-281-2/+0
| | | | | | | These are not needed in desktop profile. Change-Id: Ia2c700e528a0a9406144e525b97b67bebe5db8da Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Fix compiler version in qt-6.0.0-macx-clangIikka Eklund2020-10-231-1/+1
| | | | | | | It should be '11.0' to match the value in settings.yml. Change-Id: I2551cf84272f22cd49fc4490d6b484de88b124a4 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Add conan profile for Qt 6.0.0 iOS targetIikka Eklund2020-10-221-0/+13
| | | | | Change-Id: I46e2e442da7fc05d24f6cba50f016229d69ac287 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Rename qt-6.0.0-linux profile as qt-6.0.0-gcc-x86_64Iikka Eklund2020-10-211-0/+0
| | | | | Change-Id: Ib9fcaf31e2efff665454c6448f46e0e4381dd6b3 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Add initial conan profiles for Qt 6.0.0 desktop targetsIikka Eklund2020-10-214-0/+53
| | | | | | | | | | | | The profile files contain %QT_VERSION_PATH% tag which is meant to be patched by Qt Installer. The resulting QT_PATH will point to the installation path of the selected essentials binary package. Qt Add-on conan recipes rely on finding the QT_PATH from env to locate "bin/qt-cmake". Change-Id: Ib8273e25786adb9930da5b3ce8a68a20c29e21be Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Initial empty repositoryJukka Jokiniva2020-10-150-0/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 15:11:32 +0000