| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Add a newline after each PRL file entry. Otherwise, a line can get
longer than 16K characters, which breaks the MSVC linker.
Fixes: QBS-1465
Change-Id: Idb1e39aee8c3ae3ad6ea844723253e7d228bd7de
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
Amends 8c290c624d.
Change-Id: I9b08b921a46ac56239dd7934f8c3aa9addf70d52
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- xcspec files can now refer to variables in variable names, as in the
following line:
CONTENTS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH_SHALLOW_BUNDLE_$
(SHALLOW_BUNDLE))
- Some new environment variables have been introduced and need to be set
when running our probes; e.g. "SWIFT_PLATFORM_TARGET_PREFIX".
- The symbolLinkMode autotest made an invalid assumption about order of
output.
Change-Id: Ic845c2c4a8eafb4ece0f0bb04e6e492681a02979
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Compiler produces a lot of additional ".adb", ".lst", ".asm",
".sym", ".rst", ".lk", ".mem" files. This files should be also
processed in SDCC module (e.g. it allows to remove this files
by 'clean' command).
Change-Id: Ib07dbe63ab27e263d67025ce5cd40a967910d354
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
We need to add a file with extension '.m51' which is a
map file, generated by BL51 linker for 8051 architecture.
Also the artifacts creation code is refactored and
improved a bit.
Change-Id: I49b487acf87263dde818696d5a3478333839c30b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ibd58a4bdf6c05af79c0d847ccaacaec5381b35d5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We need to use the assembler command in the followiong format:
Usage: [-Options] outfile file1 [file2 file3 ...]
Besides, we have added an additional assembler option '-l'
to explicitly generate of a listing file; without of this option
the linking fails.
Change-Id: I0240b354f44edac94e3e4305fe6b1a4c34ca4bf9
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Do not try to detect an SDK from a driver kit directory.
Fixes: QBS-1495
Change-Id: I05ef565d599e83dcc02d0d18e656fabfd0aad943
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Change-Id: I6eef8b28a741c417dc54a33577a2ad4b43def767
Fixes: QBS-1492
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... which is used at dumping of predefined macros
and a header paths.
Reason is that for the different architectures the IAR
use different C++ language options:
* for ARM: --c++
* for AVR or 8051: --ec++
Change-Id: Ic2b4d50e9e2a978a5cbc69ed5353d5953e83c85d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Amends 65cb0d3e2d.
Fixes: QBS-1459
Change-Id: I771cc179bcc996559d76c85d785780a1b044812b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes (at least) two compile errors:
- clang: error: invalid deployment target for -stdlib=libc++ (requires
iOS 5.0 or later)
- ld: library not found for -ldylib1.o
The dylib1 is only present on macOS and not present in recent tvOS/iOS
SDKs, clang tries to link to it if deployment target is less or equal to
"5.0".
Change-Id: Ie77a514bb2661312823df054f0dfca07d69e3059
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
It seems, that console ios apps should not try to do a _qt_main_wrapper
trick since there's no platform plugin linked to the app and linker
fails to find wrapper.
Change-Id: I607db658d5e25d6029626b4a7efb46b2e228ab52
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This allows us to treat Qt.core similar to other Qt modules based upon
QtModule.qbs when bundling Qt libraries together with an application.
Change-Id: I9ae54ec40c3fb7506181afbd437f4e2f03b02e41
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is required because earlier iOS versions are broken in recent XCode
installations (at least, for XCode >= 7.0.0)
Change-Id: Ib55e2eafcf26357695ab057da8109921518b7fea
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
We need to use the '--c++' option instead of '--ec++'
to dump the macroses and headers for the C++ language.
Change-Id: I545e661babc1ffa84ef189d28b2dd59be3cef29e
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This implements support for the gRPC framework: https://www.grpc.io
Change-Id: Ia85461b9618e73827114c137fce8615e5a8139e3
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Otherwise, tests fail to locate old c++ library on recent Macs.
Change-Id: I6ff5ceb0753dea73a5da1c70cfeb97b848cb7948
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This property can be used to check if candidate conforms with some
conditions. For example, an architecture of a shared
library candidate should match the current qbs.architecture.
Also, this will allow to implement support for the "text based stub
libraries" (yaml files that point to a real library in a system) on
macOS - instead of checking real file architecture, it should be read
from .tbd file
Change-Id: Ie84a3e70d883dec949440358e2f08213a8501982
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
| |
Change-Id: I6ae2dd130cbafb03e51bc6e8e8a3e262d6d45fc6
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
In NDK r20 clang adds -lc++ library automatically which leads to link fails.
Change-Id: Ifa5ae1f4be7d8a93146ef08a5dc312596dd19147
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\ |
|
| |\
| | |
| | |
| | | |
Change-Id: Idab53d6bd9b6f2841e30d4a31f53ac53a05c2f09
|
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes: QBS-1451
Change-Id: I644835cf8ce18d546e6c8e2c75f689766456555d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|/ /
| |
| |
| |
| |
| |
| | |
It seems, that javac -version can return "12" instead of "12.0.0"
Change-Id: I804cbadb410dc11f566fda122f3082a8607ebb36
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is wrong - on Windows, INCLUDE variable already contains /include
suffix.
This also makes IncludeProbe consistent with LibraryProbe.
Change-Id: I166de8d4274842743886b0e234fff48688fd4c44
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By default, pkg-config uses qbs.sysroot property which is not desirable
in some cases - for example, on macOS, even build for current system is
sysrooted to the SDK folder within XCode installation. pkg-config
installed with brew resides in /usr/local and can't be found within an
SDK dir. For that reason, it make sense to override it manually
Change-Id: Ibf779fd1bf0e87189abb2eab23d4e9e153fcca17
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
It is never necessary to have the same library on the linker command
line twice in a row, so we can safely remove such duplicates.
Change-Id: Ie6ebe489862702828996fb78533eb4ac400df1cd
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ic8e80604deb03e48fe264271de2e0add5023af87
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We did not take into account that these might be located in a different
place than the target libs.
Change-Id: I2c27b6be6c8962416f1c062cd1d51ebed45f1796
Fixes: QBS-1445
Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This functionality broke completely in c4e60ed828, which went unnoticed
because it turned into a no-op rather than causing an error.
As a result, Qt libraries tended to appear more than once on the linker
command line.
Task-number: QBS-1441
Change-Id: Ic2634b4501f0360a1adb13aa847e34e9d38674f7
Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| | |
Fixes: QBS-1447
Change-Id: Ie03530e960cbcf0ab14a9cb501a169aec311ec1a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1447
Change-Id: Icdd94b7731d1c84a225c53f780e339f9c7034320
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allows to use more native .base property to call super class
validate function.
Change-Id: I0f68be8e5823796502c53d719a00825075666b43
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I52239c01a0e6dff3c22353c3ec4b354fd73a7662
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I3a70a4a1045444bf053ebf5ac7f32dbe72c827a5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Id689c4e0290ba83e8755b6787601338a01af07c9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I934a7bf3679dfda15ef245a9d14e834dc5136861
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: If9143a5af10c842bbb2b6dd08d201f8d9963012f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
.. for SDCC toolchain.
The SDCC compiler binary support multiple architectures (aka
8051, z80, and others). So, it is necessary to set a target
architecture option before getting the macros. We will take a
preferred target architecture from the qbs.architecture property.
If this property initially is undefined, then will be returned
macros for default compiler architecture (usually it is mcs51).
Change-Id: I379ffe90895b62e2786c3ffba2da47b1864da75d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I3b8a3607e1e5c252731dea783acd9c1a0867a127
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Id18528b1f6f6a98bec3f877e70c660180078a66c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ic02d717f80f5d831f0cedb3b7c565a9bfef3a2a3
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QtCreator does not set the qbs.architecture property for the ios-
simulator and the condition check for the Qt modules fails.
Task-number: QBS-838
Change-Id: I39fe4ad75d3261a6b83f81bf0593ee9445bcefd8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Plugins should only be linked into applications and shared libraries.
Change-Id: I95adc3f1f1ec8ea512e4166e78be1d9c5abb6745
Fixes: QBS-1441
Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iebe425c3e10be927666dd19d3be86bd30d8a43cd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
extraLibs are needed to add OpenSSL support to Qt apps.
Change-Id: Ib91f593c0be7d9a689fdc6c0537749353f3164eb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ia7edff17b4485d521177e9e87f1dd8d41c91c32a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Mips' abis were removed long time ago from the Android NDK
Change-Id: I8d006b6758ee4faa7f2d697a7252981470d43e1a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- android-16 will be used for 32 bit arm ABIs
- android-21 will be used for all 64 bit ABIs and x86. x86 has broken
wstring support in android-16 to android-19.
Change-Id: I38f6e6ec3f16c172cb0b061cfc4cc9efdb8f1700
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|