aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docker: update Qt version to 6.2.0Ivan Komissarov2021-10-261-3/+3
| | | | | Change-Id: I32ad441109df950e39d26cc766f1e38fc52f5ec3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix build with Qt 6.2Ivan Komissarov2021-10-262-3/+3
| | | | | Change-Id: Id0758d78f0ef251aeca0447ccc612d294c450a5e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.21' into masterIvan Komissarov2021-10-2658-118/+4036
|\ | | | | | | Change-Id: I3417bbe182c23f8e6a9704b008eb8a5618e4d175
| * 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>
* | Bump version to 1.22.0Ivan Komissarov2021-10-261-1/+1
| | | | | | | | | | Change-Id: I6989255b762adfb8bf1c9115f4dc42ba4a4b11e5 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Use unique_ptr for managing ScriptEnginesIvan Komissarov2021-10-237-20/+19
| | | | | | | | | | Change-Id: I89f510619196cc01a9e3b0c2273888b12b188928 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Don't use std::function for recursive lambdaIvan Komissarov2021-10-161-3/+3
|/ | | | | | | | ...in instanceItemProperties(). With C++14, we can use auto to pass labmda to itself as a parameter. Change-Id: Ifd1e13aca8b6fae2a7a7b7bcd1e255a08648a9c1 Reviewed-by: Denis Shienkov <denis.shienkov@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>
* Do not use Application item in Language testsIvan Komissarov2021-10-0610-24/+34
| | | | | | | | | This item has grown over time and now pulls bundle module and xcode module on macOS which is not desired as it make harder to read verbose logs when debugging tests. Change-Id: I7fa4dfaec477b5c6d8d8ec602d10db866c353441 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use more common functions from cpp.js for GCC and MSVC toolchainsDenis Shienkov2021-10-053-63/+22
| | | | | | | | | It makes sense to use the {assembler|compiler}OutputTags() and the {assembler|compiler}OutputArtifacts() functions also in GCC and MSVC toolchains, that simplifies and unifies a code. Change-Id: Ie8cfd185c30322139fb8871b75ea69a888c1f471 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Micro optimizationIvan Komissarov2021-10-051-2/+2
| | | | | | | No need to allocate a string we don't use when getting value from cache Change-Id: I5a0a47998004e42fe159789f6248559968e36139 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.20' into masterIvan Komissarov2021-10-047-9/+72
|\ | | | | | | Change-Id: Ibb0fdf6dc13d05c5ee45035713a631fdbfa341ad
| * Remove unused include1.20Davide Pesavento2021-10-011-2/+0
| | | | | | | | | | | | | | Fixes QtGui-less build Change-Id: Ie46fcf68fb7974d30c08467f1084cec742a6645d Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Add changelog for the 1.20.1 releasev1.20.1Ivan Komissarov2021-09-281-0/+12
| | | | | | | | | | Change-Id: I92fa6134442cad7fdb293f8f3f75e5134b2ce18a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * qmlcachegen: fix mapping separatorIvan Komissarov2021-09-281-1/+1
| | | | | | | | | | | | | | | | | | The qmlcachegen code expects '=', not ':' (despite the fact qmlcachegen --help says otherwise) Task-number: QBS-1676 Change-Id: I281502f45b8dc760c0c78ab4a27fcbebacef8a5f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Remove unused codeIvan Komissarov2021-09-271-1/+0
| | | | | | | | | | | | | | This amends 389301dffd0ba7e02fa110aab7237296f5925f7e. Change-Id: Ic42d4538866e6b910a74e9f4dda8bf265bbf8077 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * qmlcache: fix qmlcachegen with Qt >= 5.15Ivan Komissarov2021-09-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 5.15, qmlcachegen does not filter out js and qml files (see [0], [1]) but merely copies the content. QMake does this unconditionally - otherwise, qml files present in .qrc are not visible from program via QFile. Match QMake behavior and always create a new .qrc file. [0] 41864db3b61d9e81a9fe4906918d2cd3d6d32a0c [1] d5f3e7a7e319c6bd8fa8b79d8da7a6fd62b50f01 Fixes: QBS-1676 Change-Id: I495df71e14091e4b1daa50ca79a97f4685bd929a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Android: fix aab generationRaphael Cotty2021-09-242-3/+18
| | | | | | | | | | | | | | | | | | | | | | BundleTool doesn't compress native libs by default which are then uncompress when deployed on the device. This patch generates a BuildConfig.json which overwrites default bundletool behavior. Fixes: QTBUG-80766 Change-Id: Id758fe8fdbc1029b76b745f07be8ede3cbc3e96a Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Android: Add stripping for release buildsRaphael Cotty2021-09-231-2/+35
| | | | | | | | | | | | | | | | | | Stripping was removed in commit 2f5f049ecf777bcfcbfe4a17af72768248f73eab to fix debugging but is required when building apk or aab packages in release build. Change-Id: I6c70fb51ea3e87ce864fac7ebb4bc70fa69ff4e2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Drop JDK version 1.6 from testingIvan Komissarov2021-10-041-1/+1
| | | | | | | | | | Change-Id: Ifa1408183c87a6c4f20a8d1e0f3fee448e91f949 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add android testing with different ndk versionsRaphael Cotty2021-09-308-10/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | New docker images are added to test different android ndks. Those images don't have Qt so only a subset of the tests are run. So far I added 3 images: r23 (LTS), r21e (LTS) and r19c (minimum one). The other android images also have a new ANDROID_NDK_VERSION argument set to the r23. Change-Id: Iaa7c80b9cac1c7888b3297fac13333d22a9ad0bc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Improve readability a bit in instantiateModuleIvan Komissarov2021-09-301-9/+9
| | | | | | | | | | | | | | ...by using c++17's structured bindings Change-Id: I9985840977e5fd3159b30b1020d22855c76d280d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 11:35:30 +0000