| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Task-number: QBS-1454
Change-Id: I6e2514d10cca0cba0a14456ecd2abfb495539ee4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* SDCC support only the '.lib' library suffix.
* SDCC support only the '.rel' object suffix.
* SDCC produce the 'ihx' default image format.
Besides, SDCC expect same target flag for both compiler
and linker. We automatically take this flag from
the cpp.architecture property.
Change-Id: If7eac1d5ddc0c571d3c6a870f46f78d61d699f12
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ic632b377bf10e2b320956011e9a7d4eea99f560b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... 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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit adds a basic support of the IAR Embedded Workbench
toolchain for the STM8 processors family.
To use it with Qt Creator, it is enough to add there a desired Kit
with a custom IAR C/C++ compiler, and then set the following in the
Kit's Qbs profile settings:
* Key: qbs.toolchainType
* Value: iar
Tested with EW for STM8 v3.11.1 on Windows using the simple
projects samples which come with the default IAR installer.
Change-Id: Ibc116ceb33b7df49c3241d26fa97136255ba06dd
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previous implementation of SDCC toolchain based on an assumption,
that the default target architecture always is MCS51.
But, the SDCC compiler support multiple architectures:
* http://sdcc.sourceforge.net/
So, it is makes sense to add support and for STM8 architecture
to the SDCC toolchain.
Change-Id: Ibbd32764fe2fac3e45fda93ac3d903c3619efb18
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
| |
| |
| |
| |
| |
| | |
See https://github.com/android-ndk/ndk/wiki/Changelog-r19
Change-Id: Iaa778979bad4b42dbbc0b0915104cf9f9738309e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Support NDK only r19+
- Remove deprecated and unsupported stl libs: "system", "gabi++_static",
"gabi++_shared", "stlport_static", "stlport_shared", "gnustl_static",
"gnustl_shared"
- Fix armv7a link (we need to link against libc++.[a/so].API)
- Use lldb
- Use llvm bin utils
[ChangeLog][Android] Support NDK only r19+, remove deprecated and
unsupported stl libs, use lldb and llvm bin utils
Change-Id: If9d5d5462dffb6c9bf481f910ee2c3ba03bc5649
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Allow the user to override the android::versionCode and
android::versionName from QBS project file.
Change-Id: I437294e8f6b52c1072bb1c992d1c7ac5233896c9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Starting with NDK r19+ llvm toolchain has all the tools we need and gcc
toolchain will be removed in future versions.
Change-Id: Ifc88d4dbf779fd39950f23a56191e61c9369a432
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|