aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Android: Add support to generation of aab packageRaphaël Cotty2020-06-253-5/+10
| | | | | | | | | This patch adds the Android.sdk packageType property which sets the target application. By default (previous behavior) qbs generates an apk package. When set to aab, qbs generates instead an aab package Change-Id: Ic09776d08e2a2ecd68fb4c08881201a7a0a25240 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix Qt 5.15 deprecation warningsChristian Kandeler2020-06-1614-15/+47
| | | | | Change-Id: I1d6968de823c43e42ca53eb68972ba5e69dc29ed Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix possible race in ~InternalJobThreadWrapper()Ivan Komissarov2020-06-161-4/+3
| | | | | | | | | | | It might happen that finished() is emitted before the call to connect() to the QEventLoop::quit slot resulting in endless loop. Fix that by calling QCoreApplication::processEvents() directly. Change-Id: Ic0899c4d5b04d095b26912b9693ae245df6da4f2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix '-Wclazy-range-loop' warningsIvan Komissarov2020-06-087-9/+12
| | | | | | | The warning says 'c++11 range-loop might detach Qt container' Change-Id: I6b6a91d6b3298702246da94f05d21623d5f13faa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProductData: return members by const-referenceIvan Komissarov2020-06-0220-66/+50
| | | | | Change-Id: I865d28b8fd930820c7145a3bf8aa76b2dd677550 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix '-Wclazy-qstring-left' warningIvan Komissarov2020-05-251-1/+1
| | | | | | | | The warning says 'Use QString::at(0) instead of QString::left(1) to avoid temporary allocations (just be sure the string isn't empty).' Change-Id: I4ef427c4a60e7f9e40a16b3e8b64ea13e167f1ee Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for National Semiconductor CR16 ↵Denis Shienkov2020-05-251-2/+6
| | | | | | | | architecture Change-Id: I9b324380ed5f437c1a1cd43bab22a61223ffd18c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas M16C/R8C architectureDenis Shienkov2020-05-251-2/+7
| | | | | | Change-Id: I3f5822316d328e8861e54d43994de405c591c0b3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas R32C architectureDenis Shienkov2020-05-251-2/+6
| | | | | | Change-Id: I218136517821325b69af5893589b028570bc22c9 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectData: return const values/referencesIvan Komissarov2020-05-257-33/+25
| | | | | | | | | | | Qbs does not care that much about binary compatilibity (because of qbs session) and thus is is preferable to return members by const-ref (saving 2 atomic operations and preventing from accidental detaches). In case when method needs to compute some value instead of returning member directly, the function signature can be changed. Change-Id: I4e8d228761a990d274e77652c94adf9f43a758f1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.16'Ivan Komissarov2020-05-201-2/+0
|\ | | | | | | Change-Id: I9920b1dc853c8c0051e5c5be5e570c2ca38880e6
| * Remove deleting trailing slash from VS env varsSergey Zhuravlev2020-05-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | After launching msbuild from QBS I got an error "LOGGERBASEDEXECTASK : ILC error ILC1004: Directory 'C:\Program Files (x86)\Windows Kits\10lib\10.0.15063.0\um' passed to argument 'targetplatformsdklibpath' does not exist.". Seems those trailing slashes are important. Change-Id: I2839d7054c866207bbaeef3e21a4ea6a9679f477 Fixes: QBS-1551 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Add --system to qbs-setup-androidChristian Gagneraud2020-05-203-2/+10
| | | | | | | | | | | | | | | | This allow to have android settings install system wide, similar to qbs-setup-qt and qbs-setup-toolchains. Change-Id: Idc01e0ebe6e3f6f17b2e48e84f6fe2b0e95f0c63 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect IAR toolchain for Renesas M32C architectureDenis Shienkov2020-05-191-2/+7
| | | | | | | | | | | | Change-Id: I1c7deb28a34c5259b9b8f5c55cd84696ba68204b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect IAR toolchain for ColdFire (aka M68K) architectureDenis Shienkov2020-05-181-2/+6
| | | | | | | | | | | | Change-Id: Iad69544737cbca42d69cddaa182bf3aba97a770f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect IAR toolchain for RISC-V architectureDenis Shienkov2020-05-141-2/+7
| | | | | | | | | | | | Change-Id: I659d1fbfb11d325d6ff62b0dda8f429d4249f794 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Use forward slashes in IAR EW probe of qbs-setup-toolchainsDenis Shienkov2020-05-141-12/+12
| | | | | | | | | | | | Change-Id: If222254e27fe6e249f8f3e0cad5a48238d9440d9 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect IAR toolchain for Renesas SH architectureDenis Shienkov2020-05-141-2/+6
| | | | | | | | | | | | Change-Id: I9d9f90841c6deb8e02f5583bee4083aae6e11c79 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix ModuleLoader::moduleProviderConfigIvan Komissarov2020-05-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | The function stopped too early in the ItemValueType branch which disallowed to set properties of the multiple module providers. Also, it modified the 'name' parameter resulting in the invalid map key. Change-Id: I549607cb3191134201634c60b72b782874f07556 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect ARMCLANG compiler supplied in Keil MDKDenis Shienkov2020-05-111-27/+76
| | | | | | | | | | | | | | | | | | In this case the utility creates the default profile starting with the 'keil-llvm-' string. Change-Id: I81dfe94210a9e291d491568e7e0d978021453d4b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect IAR toolchain for AVR32 architectureDenis Shienkov2020-05-061-2/+7
| | | | | | | | | | | | Change-Id: Ic5c614504aaebb7d2cb30098e8f408ca9d110150 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix item scope for the "moduleProviders." itemsIvan Komissarov2020-04-271-3/+6
| | | | | | | | | | | | | | | | This patchset allows to use "product." and "project." properties on the right-hand side of the "moduleProviders." properties. Change-Id: Ib9afca4751cd4db40d3a703fd179860de362b0fa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'cppcoreguidelines-pro-type-member-init' warningsIvan Komissarov2020-04-2712-42/+19
| | | | | | | | | | | | | | | | | | | | | | Also, fix undefined behavior when setting and reading different field of a union (Lexer, Token) - according to the C++ Standard, it is not allowed to use a union to zero members of a struct. Treat these warnings as errors now. Change-Id: I0f6d071217ef55e2c75c51138fcff47048eca62f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Enable QT_NO_CAST_FROM_BYTEARRAYIvan Komissarov2020-04-212-6/+6
| | | | | | | | | | | | | | | | | | Silently casting QByteArray to char* is dangerous and it's hard to find an error in the code. Thus, forbid implicit casting and fix code accordingly. Change-Id: I216f1b19768ad529ff050df0e81bfc4ad10b7c00 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'readability-*' warningsIvan Komissarov2020-04-205-11/+9
| | | | | | | | | | | | | | Treat those as errors except for the 'readability-container-size-empty' Change-Id: I6a8bb9d68fb5bc89697cc42179337d338a51035e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Move some Visual Studio generator parts into libqbsmsbuildJake Petroules2020-04-1764-166/+241
| | | | | | | | | | | | | | | | | | | | | | | | This static library contains the MSBuild and Visual Studio solution object model classes and serialization code, without any qbs project model specifics. The latter goes into the generator plugin itself. The Xcode generator will follow the same separation of concerns design when it is introduced. Change-Id: I0a7aca2457c7b7474e0a0a127a3ce5fbec7682f6 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Suppress 'cppcoreguidelines-pro-type-cstyle-cast' warningIvan Komissarov2020-04-171-1/+1
| | | | | | | | | | | | | | Also, treat it as an error Change-Id: Ia2918ce83f2b27d8a039d2651c7edc2d40ccdbdc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge branch '1.16' into masterRichard Weickelt2020-04-159-17/+67
|\| | | | | | | Change-Id: Ie3f341fe18e2ffaf676721748279c6b027590727
| * GCC: fix detection of Mingw prefix in MXEAlberto Mardegan2020-04-152-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toolchain paths in MXE are of the form $MXE_PATH/usr/bin/x86_64-w64-mingw32.shared-g++ so we should not assume that what follows the dot is an extension that needs to be stripped (like QFileInfo::completeBaseName() does). Instead, only strip the know executable extensions. Change-Id: I51040d65e372ef3152ddd9229dd33011661c2b46 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * Session handling: Do not ignore return value of I/O functionsChristian Kandeler2020-04-151-4/+12
| | | | | | | | | | | | | | | | ... on Windows. Task-number: QTCREATORBUG-23839 Change-Id: I7b2bc8318dd5fe39583bc7ed0367425e1d062171 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * qbs session: Keep checking whether stdin is still presentChristian Kandeler2020-04-151-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, we will continue to lock the build directory if the controlling process dies. This patch implements the solution for Unix. The Windows one will follow shortly. Task-number: QTCREATORBUG-23839 Change-Id: I95ca7f6666e520c78521af1e85b765bc2e266e0f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * session: Fix reading values from JSONIvan Komissarov2020-04-131-3/+3
| | | | | | | | | | | | | | | | | | | | Apparently, QJsonObject.isNull() returns false in case if key is not present in the map. This leads to wrong default values e.g. in case of the "fallback-provider-enabled" key. Fixes: QTCREATORBUG-23852 Change-Id: Idc85b3fd3a21fc4ce704c112c8c5b7a842cf57ba Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Exclude VariantValues when checking for conflictsRichard Weickelt2020-04-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Qbs prints a warning when different modules contain conflicting assignments to scalar properties. This check assumed that the source values were always of type JSSourceValue and thus performed a invalid static cast which caused sporadic crashes on macOS in TestLanguage::moduleMergingVariantValues. No crashes were obtained on other platforms, but that was only a coincidence. This patch amends 8ff1dd00. Change-Id: Id4809496a5fbc4985d040118a4684f3ac040cdc0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix accessing temporary object dataIvan Komissarov2020-04-061-3/+3
| | | | | | | | | | | | | | Dectected by the 'clazy-returning-data-from-temporary' check Change-Id: I2ab979bb1d58ea96a36d0331aeffa6a719d2f423 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * baremetal: Fix detecting older sdcc compilerIvan Komissarov2020-03-231-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | Ubuntu Bionic has slightly older compiler version (3.5.0) which doesn't have macros that are used to detect compiler version. But it has the "__SDCC" macro containing the value "3_5_0". Use that as a fallback. Change-Id: I0bac78b684e64f11d00f8d915f806f7662d99766 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix crash in operator==(ArtifactProperties, ArtifactProperties)Ivan Komissarov2020-03-202-0/+2
| | | | | | | | | | | | | | | | Also, make operator==(SourceArtifactInternal, SourceArtifactInternal) more robust Change-Id: I2eb276621d304c7ac5fa7c78af00db09b0c2e3c4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'bugprone-narrowing-conversions' warningsIvan Komissarov2020-04-149-26/+30
| | | | | | | | | | | | | | Also, treat those as errors Change-Id: I0771aa656273fd0a01c7787870d9de9b4c631823 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'modernize-use-bool-literals' warningsIvan Komissarov2020-04-141-2/+2
| | | | | | | | | | | | | | | | Also, treat those as errors Change-Id: I90ff7778e6e6333f4ca22706c8114c3608d39a39 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'readability-redundant-control-flow' warningsIvan Komissarov2020-04-142-2/+0
| | | | | | | | | | | | | | Also, treat those as errors Change-Id: I7f27e6d19d7208dcb1ab083091e01f41017fb8bf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'modernize-return-braced-init-list' warningsIvan Komissarov2020-04-081-2/+2
| | | | | | | | | | | | | | Also, treat those as errors Change-Id: I566d3ea18965bb18df53a01914023ec73fccc620 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'google-readability-casting' warningsIvan Komissarov2020-04-071-7/+5
| | | | | | | | | | | | | | Also, treat those as errors. Change-Id: I206844540eae6eef1e921f19453402a0c2874552 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'bugprone-suspicious-enum-usage' warningsIvan Komissarov2020-04-071-2/+2
| | | | | | | | | | | | | | Also, treat those as errors Change-Id: I239b0a0597f56b87bcfdc139545b98c119232fdf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'google-readability-namespace-comments' warningsIvan Komissarov2020-04-074-4/+4
| | | | | | | | | | | | | | Also, treat those as errors Change-Id: I33e5adef456b2c3445e00297d48770d99781aedd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Dump version for C166 compilerDenis Shienkov2020-04-061-1/+62
| | | | | | | | | | | | | | | | ... if this compiler specified in a path. Change-Id: Ie01ea0651291d0ada3f0f8731ccdd054b3d38caf Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: Fix 'misc-unused-using-decls' warningsIvan Komissarov2020-04-063-5/+0
| | | | | | | | | | | | | | Also, treat those as errors now. Change-Id: I4f883c7c806d778487e37f07481d397466d5f817 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add KEIL C166 toolchain supportDenis Shienkov2020-04-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | This commit adds a basic support of the KEIL toolchain for the C166 Infineon processors family: * http://www.keil.com/c166/ Change-Id: I76f65d30c24d98f79ca8a888a142442bd2adf5f5 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Dump compiler version for C251 compiler tooDenis Shienkov2020-04-031-16/+45
| | | | | | | | | | | | | | | | | | | | | | ... if this compiler specified in a path. Now, the version detection logic are unified for both C51 and C251 compilers. Change-Id: I5455effcad01423da6ecf06f0d5d5fd7d365fa7c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Move Keil compiler version detection to separate functionsDenis Shienkov2020-04-031-62/+71
| | | | | | | | | | | | | | | | ... for a compilers specified as a paths. Change-Id: I039c7cb51bab4b8d44fee7b921f8ab837cf9470f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect C251 compiler provided by KeilDenis Shienkov2020-04-031-1/+5
|/ | | | | | Change-Id: I15ad7e2a9d9f63aa0841819216407645d977d1e3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas 78K architectureDenis Shienkov2020-03-161-2/+6
| | | | | | Change-Id: I659c1f4c9f367af7f77069264082cb30a836679f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 08:04:02 +0000