| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ie700233a6b65eb094291e81b274de539e8c2fb51
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is not actually fatal, as Qbs collects dependency information both
from the TreePathScanner API *and* the output files the compilation
process writes to. Instead, downgrade it to a warning and also point
users to the bug report. This fixes a regression from 1.5.x.
Adds an XFAIL'ing autotest.
Task-number: QBS-1069
Change-Id: I30e5f5d0d1554bf5078509768fdad12f20922319
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Export of cpp.defines could not possibly have ever worked as triple
equals comparison of a string and array will always be false. Fix that,
and then fix the resultant build errors by avoiding the addition of
the QBS_STATIC_LIB define to an importing dynamic library, and warning
in the case where the same translation unit will be seen with different
visibility settings in different contexts.
This also fixes warnings in generator plugins due to the different
visibility.
Change-Id: Icf91bfd5644c436ddea819cce61b7a4b654c0db4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ia2f48518a4a78070a05a494c46debc8903308fa2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I033c2e4b68dc29d06dec88d640c2bfc530627a03
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
FileInfo::exists() requires clean paths now.
Change-Id: I40eb3273bd0a67174cc7e91c544e5e6cfb954890
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
| |
We have to set these up per actual product, not per product name. The
latter is not taking profile multiplexing into account.
Change-Id: I359c7316f106b756aaee74a5f4b7050fbc4e2bf3
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
| |
Namely, for those in groups not located in the same directory as the
product. We will change the base directory to a more sensible one in
1.8, and this patch gives users the chance to adapt in advance.
Change-Id: I3a470b7f0664dc399633292d3f026f9636ca7aad
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
| |
These are "special" due to QBS-1030 and must be ignored for now.
Task-number: QBS-1058
Change-Id: I5a405ea035446c8d0c074f51bdde6bda78b3f8f1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QBS-1056
Change-Id: Id9c0031c3b8cdbffdb3a67a9545a0e67b9dda508
Reviewed-by: Denis Klychkov <kd.snake@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
| |
Task-number: QBS-1063
Change-Id: Ic3ffc3125dac884324c9439861857c56d27a9716
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
| |
On Windows it should just be root.
Change-Id: Ibc48b4aec6121ce03a8f2e6f60700e55b360acb6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Most Win32 API functions are limited to working with paths which are
up to MAX_PATH (260) characters long by default. Windows 10 version 1607
allows this limit to be exceeded by setting a LongPathsEnabled registry
key and manifesting the application with the longPathAware=true setting.
We cannot rely on this being the case since we support older Windows
versions and the registry key is set to off by default.
Fortunately, most Win32 API functions allow prepending the \\?\ prefix
which raises the path length limit to UNICODE_STRING_MAX_CHARS (32767)
characters. This works on all Windows versions.
For the FileInfo class in particular, this resolves potential false
negatives for file existence, inability to retrieve modification times,
and misidentification of directories as files.
Task-number: QBS-1068
Change-Id: Ia4a37fa75ede803e3e2ecb63ae1ab12d2dae33bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
[ChangeLog] Add support for building Inno Setup packages
Task-number: QBS-936
Change-Id: I4cc8e2b39ad93a7aa307a38d88e3f61687c8d364
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This corrects an issue where the user sometimes needed to set focus on a
different application and then back to qbs-config-ui in order to access
the menu bar.
Change-Id: Idecddd99e477cbee29a2e7d4aa16aeaf428757f0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ibe366f16cb3258877ec23eb2aadd139dbda9f47c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
| |
Task-number: QBS-1025
Change-Id: Ib08373b6b45fa0b728e68466d08d43a14f864d72
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
We must uphold the invariant that all property declarations refer to
properties that actually exist.
Task-number: QBS-1065
Change-Id: I3f6f4af2837b086c3afff33bed37bb79fda972a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Do not compile a helper program to output a specific environment
variable. Use cmd.exe as compiler backend and pipe commands to it.
This accelerates the whole stunt, and removes the need for determining
the location of a host compiler. It might be that there is none installed.
Change-Id: I1847feadada42ea009aafc730815207edf7e7ff0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
| |
Task-number: QBS-1065
Change-Id: I77cdd3397cb918a4f77188e1464bc0f96449b009
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The default value "undefined" tells the qrc file generator to use
only the input file name as a resource alias.
The benefits of changing the default value are as follows:
1) It's a bit weird to reset a normal value to undefined in qbs code.
2) This simplifies feature usage for output Artifacts and single files.
3) If one wants to put a hierarchical structure into a qrc file
there are a lot of cases in which they have to specify
resourceSourceBase manually.
4) When a Group with a wildcard and a prefix is used this makes user's
intention a bit clearer. This strongly separates "I want this set of
files" from "I want this directory structure".
Task-number: QBS-1053
Change-Id: Ib6413643398dca475b4b71ad884202c9e7fb823a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QBS-1043
Change-Id: I5f537f148792b0e2647d08d6e8004d79ae402f07
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
We require Qt 5.4 and therefore cannot possibly claim to support 10.6.
Change-Id: I14fb3364a31aada5635f233013f655ca238b91f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
The Qbs build requirement, Qt 5.4, requires macOS 10.7 so none of these
code paths are ever exercised. As a bonus, this fixes a deprecation
warning.
Change-Id: Ib7ae2973ca18aa4bb2e7e781a271c01ae613f0f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
... in commands. For some strange reason, this particular case was
missing.
Task-number: QBS-1049
Change-Id: I2ceb000ef5b362754f9fcbccd44b3e3c3e396e46
Reviewed-by: Denis Klychkov <kd.snake@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
We must not compare the full compiler versions, but only the major and
minor versions. This amends 26c5cbc1.
Change-Id: I8e48047ce70ba237fdbb1a8593f2469b2eb7d60a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Comparing major versions is not enough for VS 2017 since its compiler
has the version number 19.1.
Change-Id: I689e2d5399661ed7fe323eea0215d92ea4560e1a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This helps with building an "amalgamation" build of Qbs where all source
files are concatenated. Otherwise there are duplicate symbols.
Change-Id: Idb92b98709930274aa667d53430f03ac57654c32
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This helps with building an "amalgamation" build of Qbs where all source
files are concatenated. Refereneces to these symbols are otherwise ambiguous.
Change-Id: If8cb43b7822fc02df4957a9b5f6b132eae749d7a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Header guards should be present for all header files
and also be unique project-wide.
Change-Id: I9943f471792f2944ccfe04cfccef23140cbdf555
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
MSVC2015-amd64 warns about size_t -> int implicit conversion
Change-Id: I6b926e093b57bfbeedb2fbbe2b39c56d72a634f1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Previously the value of this property was taken only from the first
input. That value became the only prefix for the whole qrc file.
Now every unique value of resourcePrefix generates new <qresource> tag
with the corresponding prefix.
Change-Id: I2177b3bc38085014c41107225bcb4bd4c51ba58b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
C++17 introduces new requirements on the template parameters of
std::priority_queue.
Task-number: QBS-1051
Change-Id: I9a22b8f2d3c1f0bd532b0a76f5d2a16bebc303f7
Reviewed-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
This operation is potentially performance-sensitive. Let's gather some
real-world data on it.
Change-Id: I430ce6c3bb35106b7f2bf37ab978996ba92f36ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
The libstdc++ shipped on these platforms does not support C++11.
Change-Id: I147643a2684eb75604289491ed4f32e807f92425
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
| |
Don't link to qtmn in Qt 5.6; in that version it has been superseded by
setting the entry point to _qt_main_wrapper.
Change-Id: I9941f7347ffbe530550430ce93e1867edbc0985a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Doing that is very likely not what the user wants.
Change-Id: I1681809e6840745f11f5495cc13e2f0778d08c9a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
If we set the filter to include files, symbolic links to directories are
suppressed (presumably because QFileInfo::isDir() returns true for
them).
Task-number: QBS-964
Change-Id: Iab96a2371d99e772f3e1664e1e904f899d068116
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
At the time this code was introduced, we observed problems on Linux when
using clang to build C++11 code against libstdc++. I am no longer able
to reproduce that problem on any distribution, so let's go back to using
the platform default.
Change-Id: If477b47c674696a0973a16924c2c0d5e91d6c1ea
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When evaluating, imported names need to have a higher precedence than
names in the item scope, as otherwise they can clash with dependencies
of the product (see bug report and autotest). We cannot simply move the
file scope's precedence up, because in addition to imports and the
"file" and "filePath" properties, it also potentially contains ids from
e.g. a module prototype, which would then override the respective entry
in the module scope.
Task-number: QBS-930
Change-Id: Ifb8b7c933225f872ccc3e878b2bf01b7b0ac0f99
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
| |
Change-Id: I45a4ef9efa31afa5669fdacf4e2bc5622ea48a69
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
The original fix for module properties in groups was done in the 1.6
branch, which does not have nested groups.
Task-number: QBS-1005
Change-Id: Ib173dc4d28458ffc0db3fc1e068be86b41096357
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We hardcoded the respective flag because it was observed that linking
failed without it. However, this requirement seems to be a
(questionable) peculiarity of one specific Linux distribution (namely
ArchLinux). In general, one should not need to add the low-level ABI
library. Where it is required, the user can add it to the list of
libraries (possibly via a profile).
Task-number: QBS-878
Change-Id: Iece8e1af566b0696419b84c82d076841e1cb9c66
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
| |
Because why not.
Task-number: QBS-979
Change-Id: I6fce703e59b7806f634d749dbc90b8d28536d4de
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Let fileName contain the file name and filePath the file path like
everywhere else.
[ChangeLog] In Scanner items input.fileName now contains a file name,
and input.filePath contains the file path.
Change-Id: I3abc01989c56940df935047db56055936b3ab224
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Somewhat surprisingly, this was only done for products so far.
Task-number: QBS-1044
Change-Id: I5f6cfb904430e42f159486159ead726b522e8f60
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
This was forgotten when we introduced nested groups.
Change-Id: I824cba8c7958902268f188b5a3009d7e252fc39a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
We want to amend it instead.
Task-number: QBS-1038
Change-Id: Ib1b87b654d92911473cd03f9c32243a54fb98635
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
| |
We should be explicit about where we assume the source files to be. The
base directory might change in the future.
Change-Id: Ia1668169e78ce8334d1807e54acf085756257a2e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
| |
Like in QML, we now yield an error if the same item id is defined
multiple times in one QBS file.
Task-number: QBS-1042
Change-Id: Icdae0a95eff34c432cc1a15b310748dfdbab92eb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|