summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 1.21.11.21Ivan Komissarov2022-01-251-1/+1
| | | | | Change-Id: Ie696856c3ffc13636cb09e4deec2a35c68aec041 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Doc: align JSON API ErrorInfo with codeRobin Farine2022-01-241-1/+1
| | | | | | | | 'ErrorItem::toJson()' maps the key 'description' to the textual description of the error. Change-Id: I92c4b7521f6ffbda60196eb1fa363a0a79431f6a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt support: Fix QtQuick compiler path for Qt 6Christian Kandeler2022-01-191-1/+4
| | | | | | | Amends 1e518097fa. Change-Id: Id9c22085ec0f2e3f771e8df453fc9dbb79720d5c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Remove bogus reset of build graph's "dirty" flagChristian Kandeler2022-01-131-1/+0
| | | | | | | | It's unclear why that code was ever there. Fixes: QBS-1686 Change-Id: I893216c9b27afeec8913f59e55f475d58964eb92 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix CI for building releasev1.21.0Raphael Cotty2021-12-133-3/+2
| | | | | | | .. by partially cherry-picking d5fa3a4eb279c1ad9f0247156e5cf015261e39f0. Change-Id: I646b1ca34d5955de7b7770ccd8328a3eea797ee3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cpp Module: Implement runtimeLibrary property for MinGWBjörn Schäpers2021-11-293-2/+5
| | | | | | | | Otherwise there is no possibility to add these arguments, since cpp.linkerFlags are put into -Wl which is not correct for them. Change-Id: I4b9355e082269d390b2afc20bec1376c5d1fcd59 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add changelog for the 1.21.0 releaseIvan Komissarov2021-11-111-0/+56
| | | | | | Change-Id: Ia9d2a5bfdd8407f7520de98fe6c09c36be43c6cc Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix size_t -> uint conversion warnings with Qt 6Orgad Shaneh2021-11-0823-30/+99
| | | | | | | | | | Example: codelocation.h(88): warning C4267: 'return': conversion from 'size_t' to 'uint', possible loss of data Change-Id: I06fa98d1e6d8eec85720bd6c5150a505ea98bdd1 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* qmake: fix public dependency on scriptengineIvan Komissarov2021-11-052-1/+4
| | | | | | | Task-number: QTCREATORBUG-26516 Change-Id: I32ea47948bbf92ee512c964f069f911226c2b6a2 Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qmake: fix build with clang on MacIvan Komissarov2021-11-041-1/+1
| | | | | Change-Id: I9941963bb721fe4e8b6480c82139d6abae8891a9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qmake: fix Qt6 buildIvan Komissarov2021-11-032-1/+8
| | | | | | Task-number: QTCREATORBUG-26516 Change-Id: Id7cef7eff941dd43f61c9ee7029066a6b248b181 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Implement providing Qt libs via pkg-configIvan Komissarov2021-11-037-1/+95
| | | | | | Change-Id: I2675968a6e11ffea2e7d44fbfbd1a77018999a4b Reviewed-by: Kai Dohmen <psykai1993@googlemail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix linking with gcc 8Christian Stenger2021-11-033-3/+3
| | | | | | | gcc removed the need to link against libstd++fs in gcc9. Change-Id: I22bfe4fa9aea0f1b56328b2d08497c713c6e6d9a Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Allow protobuf to have runtime from providersIvan Komissarov2021-11-0210-12/+74
| | | | | Change-Id: I2d951f691c601de9b2d06d1a580b818283eabac5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* pkgconfig: fix variables in the merged packageIvan Komissarov2021-11-012-0/+6
| | | | | Change-Id: Ib143dfc99392ed129ea04d57ed8e378c7d1230a9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* pkgconfig: propagate variables to JSIvan Komissarov2021-11-011-0/+9
| | | | | Change-Id: I902551f9d334b1939e9dae784deb1ad123bf73ea Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* pkgconfig: Rename vars to variablesIvan Komissarov2021-11-014-10/+10
| | | | | Change-Id: Iffc41104f002684525f5a0efe6c44cd326299678 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: fix Windows buildIvan Komissarov2021-10-291-4/+4
| | | | | | | | Do not use add_qbs_library as it does not support INTERFACE libraries. Change-Id: Ie7b09a4fa620c8030a4130d6b5919009688811a7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Do not migrate profiles dir in Settings anymoreIvan Komissarov2021-10-262-34/+3
| | | | | | | | | It was only used by Qt and is not needed because of providers these days. Task-number: QTCREATORBUG-26475 Change-Id: I8bf79bcaa7468c8df3669902ac453d46bbfa46f8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Print conan output while ConanfileProbe runsKai Dohmen2021-10-266-7/+47
| | | | | | | | | Sometimes installing dependencies with conan takes multiple minutes. To see what conan does and if somehow conan stopped working the conan stdout and stderr will be printed to commandline. Change-Id: I987ef95b38deecd713dc6b46be0e2641025345c6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Split libDirs and extraPaths variablesIvan Komissarov2021-10-266-13/+32
| | | | | | | | | pkg-config has 2 different variables - PKG_CONFIG_LIBDIR overrides the default search paths and PKG_CONFIG_PATH prepends paths to the default paths or paths set via PKG_CONFIG_LIBDIR. Change-Id: I8f67b7bbae9325b17abb20ec5eb8d037626c8089 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Correctly propagate fallbackEnabled propertyIvan Komissarov2021-10-253-1/+9
| | | | | | | | | When looking for transitive deps, we need to take into account not only the value set via parameters, but also the value in the property of the Depends item. Change-Id: I3fa6f0b027a3e00c35533f57070e000761dfc340 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* capnproto: add test with the new providerIvan Komissarov2021-10-252-0/+18
| | | | | Change-Id: I4b91047bd688419ca9626d58a304bbeabf9943e7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* pkgconfig: Implement early dependency mergingIvan Komissarov2021-10-2511-16/+345
| | | | | | | | | | | | Due to performance reasons, we have to do the dependency resolution on the qbspkg-config side, like original pkg-config does. Otherwise, it is not possible to use GRPC module as it depends on a bunch of ABSEIL libraries which has a lot of cross-dependencies and QBS cannot handle them (resolving takes > 10 minutes for a simple dependency on GRPC). Change-Id: Ice25f6cea09fe731a511d91891936ba746e5b697 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: correct rcc path for Qt >= 6.2Raphael Cotty2021-10-252-1/+3
| | | | | Change-Id: If7df08112fd2b89503c712418c8d4dc578d25b0e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Add android image for Qt 6.2Raphael Cotty2021-10-255-13/+70
| | | | | Change-Id: Ib48209643b755954f0f38c3f1bcfb487e23cf292 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: correct reading of prl files and remove pthread libRaphael Cotty2021-10-251-3/+10
| | | | | | | | | | | | | prl files for Qt versions 6.0 and 6.1 don't have an architecture suffix. prl files from Qt version 6.0 require pthread in the QMAKE_PRL_LIBS variable but the pthread functionality is included in the libc on android. The issue did not trigger an error before Qt 6.2 because the prl file was not read. Change-Id: Ia59d1102d6136aa87bfc17df7c6981048b0d0fca Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: fix qch buildIvan Komissarov2021-10-221-2/+2
| | | | | | Fixes: QTCREATORBUG-26407 Change-Id: I840d2446f91116a9707960de4a27f04a3ad6d068 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix typoIvan Komissarov2021-10-211-1/+1
| | | | | Change-Id: Ief3341f2accf2c62b3d3bcf0f70a2ed2bf0cb03c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: fix macOS pipelineIvan Komissarov2021-10-211-4/+4
| | | | | | | Xcode version has been changed from 12.5 to 12.5.1 Change-Id: I8ab21a0982aeb0d426d20a378e22dc790a552cdd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: clarify that app is not runnableIvan Komissarov2021-10-191-3/+11
| | | | | | | | ... unless rpaths are set. Also, link Running Applications page with the "qbs run" docs. Change-Id: If981555cb617324d45408d98f7f5bc61ba737eaf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix handling static mode in pkgconfigIvan Komissarov2021-10-191-1/+4
| | | | | Change-Id: I51b731afee1ed3c084be03813c203e2817fcfd9b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* pkgconfig: Merge packages and broken packagesIvan Komissarov2021-10-1913-45/+117
| | | | | | | | | | This is required for the ongoing patch that merges the dependencies on the pkgconfig level - a valid package may change it's type to broken if it has unsatisfied dependencies. Change-Id: I21e6a214d8524fb95e6b837604ae6b7f32360d4f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: add page for Qt module providerIvan Komissarov2021-10-193-17/+79
| | | | | Change-Id: Ic912c4b11780503d368602c8c103fd9ece589853 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Copy variant from QtC sourcesIvan Komissarov2021-10-199-0/+2608
| | | | | | | | | | We can't use std::variant on macOS when targeting macOS 10.13 (which is still the case for QtC) since it does not have the required runtime for std::variant (namely, the std::bad_variant_access exception) Change-Id: I3b6bcdb1219354aa040405d732a502769617e13f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Don't mention the old-style import qbs statementRichard Weickelt2021-10-181-3/+0
| | | | | | | | | The import qbs 1.0 import statement has been removed a long time ago, but it was still mentioned in the hello world example. Task-number: QBS-1678 Change-Id: Ie44cae1a25f007e6bbeaf0632f472089428d6c47 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix typoIvan Komissarov2021-10-171-1/+1
| | | | | Change-Id: Icf638bfb638b3c80a029c260140d82073ef3a5b5 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix QVariant hashIvan Komissarov2021-10-171-1/+2
| | | | | | | | | Add missed bool branch and fix uint branch. This amends 327d665d708c7350c95e7a85c25d2c22f2f81c48. Change-Id: I35b41300e610dd0b83106944f53bdc8264c391c8 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix compiler warningIvan Komissarov2021-10-151-2/+1
| | | | | Change-Id: Ie890e307af9c28a1b904c5fde195871f0f924813 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* pkgconfig: fix baseName detectionIvan Komissarov2021-10-144-1/+34
| | | | | Change-Id: I83691e0e35cf4bbf9955eb0bad58b5a15bf1779a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Implement eager pkg-config providerIvan Komissarov2021-10-1415-1/+630
| | | | | | | | | | This implements provider that generates modules based on all .pc files present in system. This allows to get rid of the multi-shot providers such as fallback provider. Fixes: QBS-1614 Change-Id: Icf87ac609bc34bd26e8ed94ae547a7e649835a3a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix handling pkgconfig operators in jsIvan Komissarov2021-10-131-1/+31
| | | | | Change-Id: Id376a85966ecc0defd3d453d79318dae0da9643f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* pkgconfig: Fix MSVC warningOrgad Shaneh2021-10-131-1/+1
| | | | | | | pkgconfigjs.cpp(59): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data Change-Id: Ic95eac63b3b6e2c7b3dad3bcca41f4e18f4f8b52 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Use experimental filesystem with GCC-7Ivan Komissarov2021-10-125-4/+40
| | | | | Change-Id: I49a45cd48f861186cc55fcf304ed69e0481c2908 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Don't use std::filesystem with mingwIvan Komissarov2021-10-122-2/+2
| | | | | | | ...in CMake and QMake builds Change-Id: I423f1451461288c26db56079129e24c6b3d36e72 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix qmake build on WindowsChristian Stenger2021-10-121-1/+1
| | | | | Change-Id: I93a3df9447a015f2538cb42612398c959a177d19 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Use common function for property overridingIvan Komissarov2021-10-075-29/+41
| | | | | | | ...in Module and ModuleProvider loaders Change-Id: I3d60ec1efb9e655decf599179ddec77624186521 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix setting stringlist properties in module providersIvan Komissarov2021-10-069-65/+92
| | | | | | | ...when using foo,bar,baz syntax Change-Id: I013a55f02c5d6d4bbbccf809b9524bed3c486df4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Another micro optimizationIvan Komissarov2021-10-061-1/+2
| | | | | | | | Remember the end iterator of the map to avoid repetitive calls to end(). Change-Id: I7f5957ca793432a8a1fde8a0ae23d7fc43ed42cf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use some SFINAE magic in FileInfoIvan Komissarov2021-10-062-17/+63
| | | | | | | | | | Instead of reling on macros, we use SFINAE to check the presence of specific fields in the stat struct. Hopefully, this covers most of the cases. Anyway, that's what Qt does in its QFileInfo implementation, so Qt does not compile, neither should Qbs. Change-Id: If6b517ca2c4fc72525a0de8a16f7f8b424217098 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
View Lorry Controller Status