| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Despite the fact that the second Properties item is not evaluated on
macOS, this "works" because isBundle is set to undefined (which is
false) due to a bug with Properties. Set isBundle:false explicitly for
macOS as well.
This amends 1eff548646
Change-Id: Ifd5bc3b656a0eff02914e4fe43945b0e8b0f04fe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I4890eb09182446eb4df0e0c1ab8a6ab0cda1e6cd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
If optional module B depends on an invalid module A (i.e. whos validate
script throws an exception), module B should be not present as well.
Fix that by remembering the initial value of the "required" property in
the Depends item.
Change-Id: Ia21587b3f5a8bd49c12b9f31b65e009fb2eeafb9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Default properties were not initialized, but we do it everywhere else.
Change-Id: I43226b7e683efe9295f1d587e374ef786d602ddb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
When building Qbs there might be project defines present that
make the compile fail.
Drop these defines if present.
Change-Id: I24532efca94560a21690f3016282a8f9420abe54
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Fixes: QBS-1569
Change-Id: I190b4c0cc6f83078f7e16ed3263510e0bc208f4b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I1d6968de823c43e42ca53eb68972ba5e69dc29ed
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
The warning says 'c++11 range-loop might detach Qt container'
Change-Id: I6b6a91d6b3298702246da94f05d21623d5f13faa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I865d28b8fd930820c7145a3bf8aa76b2dd677550
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
architecture
Change-Id: I9b324380ed5f437c1a1cd43bab22a61223ffd18c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I3f5822316d328e8861e54d43994de405c591c0b3
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I218136517821325b69af5893589b028570bc22c9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: I9920b1dc853c8c0051e5c5be5e570c2ca38880e6
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I1c7deb28a34c5259b9b8f5c55cd84696ba68204b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Iad69544737cbca42d69cddaa182bf3aba97a770f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I659d1fbfb11d325d6ff62b0dda8f429d4249f794
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: If222254e27fe6e249f8f3e0cad5a48238d9440d9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I9d9f90841c6deb8e02f5583bee4083aae6e11c79
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ic5c614504aaebb7d2cb30098e8f408ca9d110150
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Treat those as errors except for the 'readability-container-size-empty'
Change-Id: I6a8bb9d68fb5bc89697cc42179337d338a51035e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Also, treat it as an error
Change-Id: Ia2918ce83f2b27d8a039d2651c7edc2d40ccdbdc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ie3f341fe18e2ffaf676721748279c6b027590727
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
... on Windows.
Task-number: QTCREATORBUG-23839
Change-Id: I7b2bc8318dd5fe39583bc7ed0367425e1d062171
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Dectected by the 'clazy-returning-data-from-temporary' check
Change-Id: I2ab979bb1d58ea96a36d0331aeffa6a719d2f423
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Also, make operator==(SourceArtifactInternal, SourceArtifactInternal)
more robust
Change-Id: I2eb276621d304c7ac5fa7c78af00db09b0c2e3c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Also, treat those as errors
Change-Id: I0771aa656273fd0a01c7787870d9de9b4c631823
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Also, treat those as errors
Change-Id: I90ff7778e6e6333f4ca22706c8114c3608d39a39
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Also, treat those as errors
Change-Id: I7f27e6d19d7208dcb1ab083091e01f41017fb8bf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Also, treat those as errors
Change-Id: I566d3ea18965bb18df53a01914023ec73fccc620
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Also, treat those as errors.
Change-Id: I206844540eae6eef1e921f19453402a0c2874552
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Also, treat those as errors
Change-Id: I239b0a0597f56b87bcfdc139545b98c119232fdf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Also, treat those as errors
Change-Id: I33e5adef456b2c3445e00297d48770d99781aedd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
... 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>
|