summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Qt: warn if no qmakes were foundIvan Komissarov2021-09-211-15/+20
| | | | | | Task-number: QBS-1672 Change-Id: I0a7afc453a484b7467d2eb0d049685bea373c199 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* freebsd: fix TestBlackbox::removeDuplicateLibrariesIvan Komissarov2021-09-211-1/+2
| | | | | | | | FreeBSD uses the LLVM linker these days, so we need to check that similar as we do on macOS Change-Id: I28b8aa0743173b20caa8932f942b59dd369d686a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* freebsd: fix TestBlackbox::assemblyIvan Komissarov2021-09-211-1/+1
| | | | | | | | | | | Previously, we used -I flag to pass system includes to as. Revert this behavior since FreeBSD as does not have the -isystem flag. This amends ff04acd64d85d460e0f52a7ead233ae503e616d7. Change-Id: I7b36839698634ab2ca9ef8ff199356ebc471eebb Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* freebsd: fix filetime precisionIvan Komissarov2021-09-201-1/+6
| | | | | | | | FreeBSD support ms precision, but the used macro cannot detect that. Check OS version instead. Change-Id: Ia9bb872941bcd994b5aa290487468a332aa2d378 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* freebsd: fix target linker flagsIvan Komissarov2021-09-201-2/+24
| | | | | | Fixes: QBS-1312 Change-Id: Ic9cf4d7a9a980f31063a93c49a6f07c4b8c6abfa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Correct aab generation command descriptionRaphael Cotty2021-09-191-1/+2
| | | | | Change-Id: I2c67d35de4268215a38516b6ed8085c60df416ef Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Fix sdk documentationRaphael Cotty2021-09-171-1/+14
| | | | | | | | Add documentation for Android.sdk dexCompilerName and add some missing "since" tags. Change-Id: I3e9091f89d29eb5c9ab84b2978e0c41d2fda4a7f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: Do not fail build if docs cannot be builtIvan Komissarov2021-09-171-2/+8
| | | | | Change-Id: I597c984e98ff5bd5b05d82e4ec27c20ea59fba30 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake: do not unnesessary rebuild docsIvan Komissarov2021-09-092-21/+62
| | | | | | Task-number: QBS-1671 Change-Id: I49672dc4609b370407eb7c76de72e63beac5aca3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* doc: fix linksIvan Komissarov2021-09-091-4/+3
| | | | | | Change-Id: I896a2725a31412af3bab8c0f211a64da77837e03 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: Fix copying Qbs resourcesIvan Komissarov2021-09-081-12/+59
| | | | | | | | ... to avoid doing unnecessary actions when rebuilding project Fixes: QBS-1667 Change-Id: I8ed95c076494ab6aa3194491a3b9109478245767 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake: Build docs without QbsIvan Komissarov2021-09-074-85/+296
| | | | | | | Fixes: QBS-1671 Change-Id: I3f0522d6990caa661997dd773d9b3af662bd2ed8 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Bump versionChristian Kandeler2021-08-311-1/+1
| | | | | Change-Id: I9568591abb5760db694330d1345a5b1fe7354f20 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* CMake: fix release build with MSVCIvan Komissarov2021-08-301-1/+1
| | | | | | | | ... and bundled QtScript Fixes: QBS-1660 Change-Id: Ia90087044e1dd1d9a23482143fd1d656ca7d1515 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GitHub actions: add job for building release archivesv1.20.0Ivan Komissarov2021-08-271-9/+78
| | | | | | | The job includes binaries as well as sources and checksums Change-Id: I4afc95d6b1dd9cf5a17348c24ebb4f537dba215d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add changelog for the 1.20.0 releaseIvan Komissarov2021-08-241-0/+62
| | | | | | Change-Id: I5afd424c4481f6bd018db1b550baa93f2c3caf8f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* CMake build: Fix build with Qt Creator and CMake < 3.18Eike Ziller2021-08-171-1/+2
| | | | | | | | | | | | | | | | | | Cannot create alias targets for targets that are imported. For CMake >= 3.11 we could try to force the IMPORTED_GLOBAL property like done with Core5Compat, but in practice this could lead to other issues and would not be supported with CMake 3.10. Make qbsscriptengine an interface library that links to Qt5::Script instead. Amends ea0e25b4ca6adeebe33187e5c12dd254aaa55fec Change-Id: Id50475a7f9bdad4566bde760806539b990c72add Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Qt support: Understand QT_INSTALL_PREFIX in prl filesChristian Kandeler2021-08-161-0/+1
| | | | | | | | This variable appears to be used these days (observed e.g. in Qt 6.2 for iOS). Change-Id: I5ec17a0b80e59d9a27a15722ea01c24d6d569207 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* CMake build: Look for QtScript quietlyEike Ziller2021-08-161-1/+1
| | | | | | | | | If it is not found, the internal QtScript engine is used. So the warning that QtScript is not found is just noise, and always there when building with Qt 6. Change-Id: I364cd47724c7b8ca6abaf8d9a3566d91e434be38 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Documentation: Add "c++20" as possible value for cxxLanguageVersionChristian Kandeler2021-08-121-1/+1
| | | | | | Task-number: QBS-1657 Change-Id: I94a47a298673a83fbf6077183aaddae96bf221ca Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* MSVC: Understand "c++20" as language versionChristian Kandeler2021-08-061-1/+1
| | | | | | | | Otherwise, this value will not result in the /std:c++latest flag. Task-number: QBS-1656 Change-Id: I26c077e8200c2a3aff865327cb6c0569f7fdbaab Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: smarter treatment of minimum_versionIvan Komissarov2021-08-051-1/+5
| | | | | | | | | | lower minimum cmake version to be able to compile QtC with older cmakes. However, when using newer cmake, take advantage of its policies (e.g. ability to disable warnings) Change-Id: Ibda3a7adc92307325ec9c38e2b7f333c17a5de31 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: fix setting MACOSX_RPATH propIvan Komissarov2021-08-051-0/+7
| | | | | | | | On macOS, we need to exclude the @rpath/ prefix from the dylib name when building with -DQBS_ENABLE_RPATH=NO Change-Id: I91c17613de6f29ca54cfbfa40f149580d1120073 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove `import qbs` from all project filesDenis Shienkov2021-08-04147-233/+13
| | | | | | | | | | | | | | ... because we don't need in this inclusion at all. But for some cases it is impossible to remove that inclusions (and even to move on next lines) because then the some tests are failed by unknown reason. For those tests were added the following comments on the inclusion lines: `// FIXME: Don't remove this import because then the test fails!` Change-Id: I9153fd0e38b94af08168e499ee46a23889ee4d73 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* msvc: fix passing /Zc:__cplusplus flagIvan Komissarov2021-08-034-0/+33
| | | | | | | | | It is mandatory to pass /Zc:__cplusplus when building with Qt 6.2 and MSVC. Fixes: QBS-1655 Change-Id: I27d928a568d0ac2075ce3f77f4142e20342be358 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QtScript: set cxx standard to c++17Ivan Komissarov2021-08-023-4/+0
| | | | | | | The code was ported to c++17 so there is no reason to use c++14. Change-Id: Ie57d660c92f17a6ae1f25ede564b7da494306fe2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add Qt6 build with QbsIvan Komissarov2021-08-011-0/+10
| | | | | Change-Id: Ic14e9d75f2c71d2f795598b6857ffbf105814ce8 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* qt6: fix build with Qt >= 6.1Ivan Komissarov2021-07-313-5/+15
| | | | | | | | | | | syncqt.pl was moved to the libexec directory This change requires Qbs 1.19 when compiling with Qt >= 6.1 (but not with earlier versions) to work as Qt.core.libExecPath was only introduced in 1.19. Change-Id: Ifa998ca5ee536d63d625c0647eaab74120fdda82 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix typo in MSVC toolchain when handling cpp.linkerWrapper propertyDenis Shienkov2021-07-311-2/+2
| | | | | | Fixes: QBS-1653 Change-Id: Ide8e3b75b86ef5bf2018d1cf962e7429796e59e4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Build scriptengine as a shared objectIvan Komissarov2021-07-305-51/+23
| | | | | | | | Otherwise, we have an ODR violation when global static object is instantiated twice - one in qbscore and one in tst_language. Change-Id: Ib27d403da70ed16be3eb7ca2d979a67ae8a2259e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: fix link with static stlRaphael Cotty2021-07-301-0/+1
| | | | | | | | | | Commit e7f204c4b82475f39c3f5a3870a7393857b1a29a removed assignation of staticLibraries with staticStlFilePath which made impossible to link with static stl. Fixes: QBS-1654 Change-Id: I83a176918d423a371741a97b4c48c0f6eda03138 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* docker: Update Qt version to 6.1.2Ivan Komissarov2021-07-301-3/+3
| | | | | Change-Id: Ic75271f17ab4bbfbaccad605adf0bb9f16189a06 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: fix QtC buildIvan Komissarov2021-07-292-4/+2
| | | | | Change-Id: I4f5ac22c5a58af984598d772c4f95cf1c9a465cf Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Always build with project file updates supportIvan Komissarov2021-07-2719-72/+11
| | | | | | | | Since QtGui dependency was removed, there is no reason not to Change-Id: Ib8975451f3c36a77e22a077bba18b5659f414767 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Do not modify the global state after running providerIvan Komissarov2021-07-275-51/+36
| | | | | | | | | | | Instead, cache the result of the provider in a QHash using the provider/ module name and config as the key. This allows to have a clean state for each Depends item, so the order in which they appear does not influence which modules are generated. This is required for the later patch that implements "named" providers. Change-Id: Ia395cc94430763ed33d7ff5f2ee39e36d64f195e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Wrap ModuleProviderInfoList in a structIvan Komissarov2021-07-2712-23/+38
| | | | | | | Required for ongoing patchsets - later patches will add more members. Change-Id: Iad57e17139b104e55221059eedb8c0f057f6f4e0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge "Merge branch '1.19' into 1.20" into 1.20The Qt Project2021-07-2710-18/+78
|\
| * Merge branch '1.19' into 1.20Ivan Komissarov2021-07-2710-18/+78
| |\ | | | | | | | | | Change-Id: I2c7c200d4b0057bf7115306d000c13e60d2e8bd2
| | * Add changelog for the 1.19.2 release1.19Ivan Komissarov2021-07-261-0/+5
| | | | | | | | | | | | | | | | | | Change-Id: If0710367d0d99b0923c4b4fdcb4651b7b024d8f9 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Revert usage of toWindowsSeparators() for KEIL C51/251/166v1.19.2Denis Shienkov2021-06-281-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous commit 9e5ef99 introduces regression where the non Windows path separators does not work in some cases, that lead to the compilation errors (although CI tests are succeed). This strange behavior seems related to the old engine of these toolchains. Thus, we need to use the Windows path separators again, besides everywhere in the KEIL documentation are used only the Windows separators. Change-Id: I2aa0f28651b914414bcd6b67bf451b0af1b73c18 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * codesign: Add additional signing flags at end of commandDenis Shienkov2021-06-161-4/+7
| | | | | | | | | | | | | | | Change-Id: I4133d6716ee6f226cdd56637f86c2b1f3e1cda65 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * codesign: Add new codesign.timestampAlgorithm propertyDenis Shienkov2021-06-164-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this property on Windows when we use the codesign.signingTimestamp property. This property should be set with the "sha256" value in case when the app is to be distributed over the App Store; otherwise the the codesign.signingTimestamp property is quite useless. Fixes: QBS-1651 Change-Id: Iacc5f80b8acf81ea1a34f55416e6966c41b0e727 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * codesign: Fix checking if product is a frameworkIvan Komissarov2021-06-143-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not correct to check for the frameworkVersion to determine if product is a Framework - e.g. Xcode always sets this variable. Instead, product.type or product.bundle.packageType should be checked instead. This fixes the problem when codesign incorrectly determines bundle as a framework if product.version is set. Fixes: QBS-1649 Change-Id: I067e852df82a43897000d45e27908dd5e22eac70 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
View Lorry Controller Status