| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
The triplet -target x86_64-apple-ios-macho is no longer valid, it should
be -target x86_64-apple-ios8.0-macho
Change-Id: Ib7ce96100e1751625784db7385b44c53a2747e07
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ie4584b39080db3e2d2b87ca0fa1b73a6f807ef97
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
From Qt 5.14 target suffix is required for the multi arch packaging. This only affects
android applications using Qt. The suffix can't be applied in QtApplication because
a project using CppApplication and depending on Qt.core won't have it.
Beside using targetName is error prone as the user can change it.
So instead of using targetName for the suffix this patch adds the suffix when
deploying the "android.nativelibrary" for packaging and only for Qt applications.
Fixes: QBS-1608
Change-Id: I0704d5433c8a1d513dfdef71cecbc99ea5458181
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Amends 2f5f049e.
Change-Id: Ifa77899b3f5b206c1436f6ad6baea4c4d7a238ed
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use java.additionalClassPaths property to allow compilation of binding classes
because starting with Qt 5.15 they depend on QtAndroid.jar
Update AndroidManifest.xml with uses-sdk node using new properties Android.sdk.minVersion
and Android.sdk.targetVersion because Qt 5.15 uses androiddeployqt to set it.
Fixes: QBS-1580
Change-Id: I2fa5e77bb183be1b55e9dd9756fb7b6eb1f3c9d4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The product variable in the Export item refers to the exporting item.
If a qbs property is changed (example: qbs.architecture for the multiplexing
in Android) then the Depend failed because the qbs module was not loaded yet for
the exporting item.
Fixes: QBS-1576
Change-Id: I220c47b3094727fe169d3dccd244ab2785a782b7
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: I42518663555a503e2bc3dea9b33fc604cbee51e2
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
| |
Fixes also the broken link in the nuspec file.
Change-Id: I0da24c19eb388a8377772fa3f1115a6afba31777
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I13bb24c875a2a2fb3503ea5344171267b74bf706
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
We need to add the cpp.assemblerFlags property, because now
the cpp.driverFlags property does not passed to the assembler.
Change-Id: I9d7429126e4d99284fbe3307a4950904913af3d6
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
We use different license for examples
Change-Id: Ia0ceb7c36997185ac1cae6c72fc9873bfd0b15fe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This fixes the issue that Qbs doesn't pass the compiler defines to moc
when processing header files which resulted to Q_OS_* being not defined.
Fixes: QBS-1592
Change-Id: I58a0cc9af5cfa2fb4a370bb0d7204a3b100da437
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ia764530de200b80acf833e0e9ffc751b1988756c
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Within the groups of user-provided and system-provided paths,
environment variables need to take precedence over properties, because
there is currently no other way to override the search paths of probes
from the outside if the probe-using code did not explicitly bind them to
Product/Module properties.
We search directly user-provided paths before ones from system-provided
environment variables to minimize the risk of surprises due to outside
influence.
[ChangeLog][Behavior Changes] The lookup order in PathProbe changed to
[environmentPaths, searchPaths, platformEnvironmentPaths,
platformSearchPaths]
Change-Id: Ib0c3bc44e5a8efaaaa073f28f1f3a53feb0f78db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The '__ARM_ARCH_PROFILE' macro contains the desired ARM profile
letter, which appends to the resulting ARM architecture name.
But a problem is that this letter wrapped in quotes, e.g. 'M'.
In this case the constructed architecture also has this quotes,
e.g. armv6'm', that's wrong.
We need to remove all quotes from the found letter and then
append this letter to the resulting string.
Change-Id: Idea61082ebb584151ddcb1acc9eba62a516ea170
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
| |
Instead of building all jobs only in the master branch, we want to build
them on all branches that are not CI branches.
Change-Id: I799ef0232e96604db2788e9a86abbd3046af1398
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
KEIL ARM compiler generates a listing files with 'short' names.
For example, for the source 'main.c' file it will produce the
listing 'main.lst' file, instead of the 'main.c.lst' file.
Thus, we have to account for this behavior in our tests.
Change-Id: I69ef693cbdd0aacf838eaf382e13e09d7fadbfb1
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A problem was in that the SDCC compiler does not have an option
to disable generation for listing files. Besides, it use listing
files for a linking.
So, we need to use a workaround to remove the generated listing files
after linking in case if the cpp.generateCompilerListingFiles
property is false.
Change-Id: I5913e62d307d296bd8891654d20787cf3a54833c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
| |
We need to use the '-Ohz' options for the small code size optimizations,
and the '-Ohs' options for the fast code optimizations.
Fixes: QBS-1590
Change-Id: Ia172d29d884acd2161e072d245ebb13b89650e33
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
We need to use the /Fa compiler option as described here:
* https://docs.microsoft.com/en-us/cpp/build/reference/fa-fa-listing-file?view=vs-2019
Change-Id: I81470bfbf84563a49bd5336e7204a07d5b2c910e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
| |
... to get value of cpp.generate{Compiler|Assembler}ListingFiles
properties.
Change-Id: Iefd1401ac475a7937843a80af021668f0241a8c7
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
1. We need to use the {NO}PRINT linker options:
* https://www.keil.com/support/man/docs/bl51/bl51_noprint.htm
2. The KEIL C251 should generate the linker MAP file with the *.map
extension.
Change-Id: Ibc1f362c7010a1c2812c21382b617e246c81e100
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: I7f88ab54dd3e8870b55bb3540250eb037d328206
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This test checks the cpp.generateLinkerMapFile property,
which enables or disables generation for the linker map
file.
Take into account, that currently not all toolchains completely
supports or implements this feature, and this test skips such
toolchains.
Change-Id: I5ba90116ab0481bb65ff866cf02f8a1963cf00a9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This test checks the cpp.generateCompilerListingFiles property,
which enables or disables generation for the compiler listing
files.
Take into account, that currently not all toolchains completely
supports or implements this feature, and this test skips such
toolchains.
Change-Id: I533e6b2e5b4af5668cf24f851334b9530bc3a901
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: I9894098b05004bb99273e091e3d1821f88d7c4af
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
... because the KEIL C166 compiler completely supports this feature.
Change-Id: I86c2a6fdf485fd7c01544d44a4b2fc8b5401a7ad
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
| |
Task-number: QBS-1576
Change-Id: I333164e160655492c1378d96673fc8c8ab6f6330
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
| |
This test checks the cpp.defines property.
Change-Id: If5ba39ef48c91147b883b2fe0dcab894b54e3cdb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This test checks the cpp.libraryPaths and the cpp.staticLibraries
properties.
This test excluded for the KEIL C51/C251/C166 toolchains,
because this toolchains has not the options to specify the
library search paths:
* https://www.keil.com/support/docs/1298.htm
Change-Id: I17b5dc64ae3baacb32621b359863ba42c908d416
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This 'none' value should be used for a bare-metal toolchains
in the qbs.targetPlatform and the qbs.targetOS properties.
Now this value is set in the profiles during automatic detection
of such toolchains as IAR, KEIL and SDCC.
Take into account, that it is impossible to do the same and for
the GCC toolchain, because there are not exists a proper way to
know that a current GCC is for a 'bare-metal'. So, the users
should change the qbs.targetPlatform manually.
Change-Id: I178fd526bbb5ae44f18e35ff12970ed0718c476d
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Only the ".so" suffix is supported on Android.
Fixes: QBS-1578
Change-Id: Idebece5338a765e779ff987fd89af66977ecc0fe
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
| |
The scope should be the product item itself.
Fixes: QBS-1587
Change-Id: Iccdc89e3b57d6ee1f11205961cf6244ea560f425
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A problem was in that the GenericGCC.qbs file missing the
initialization for the staticLibrary{Prefix|Suffix} properties.
This properties are initialized only in the derived
UnixGCC.qbs or MingwBaseModule.qbs modules, which are does
work only for the 'unix' or 'windows' platforms.
So, we need to initialize required properties inside
of a base GenericGCC.qbs module.
Change-Id: Ie25f1a19acbc5d86e65eb5ac8f8205ae8079ebd9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Id25b339ddab14bb7c1fac68a747e94b1ac3ba58d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
There is no easy way to get xcode version from the c++ code, so add
arm64 macos for all xcodes
Change-Id: I4a8f6bff8ef5e067689d03a85917cdf0cb601ffe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
... because using target OS has not sense for a bare-metal toolchain.
Change-Id: I266a11a3de62443b9a4b5aef88707cc4ddfd0635
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|
|
|
|
|
|
| |
... because it is not supported on most bare-metal platforms.
Change-Id: I40900f78255f0c6c2553d5b0f575de085b7a0b1f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
| |
Fixes: QBS-1304
Change-Id: Ie7d2c4827119dbdc6c807c56912431fb3111f712
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I968b45787cc5e410a6d58bfd092213118051e57a
Fixes: QBS-1318
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
The path constructed by Qbs when using absolute framework path instead
of it's name is no longer valid since frameworks now use .tbd files
instead of a real binary
Change-Id: I2ff1222eeac9405a8ad82f8c76f56cbeaee13995
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
According to C++ standard, it is not allowed to read/write non-atomic
variable from different threads.
Change-Id: Ia48a997b1f417ed68234afdcaad6d70c92d26064
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
... for file systems with low timestamp resolution.
Change-Id: Ie94543c229d912e79442399dbf095d9b77b8e1d4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
| |
Fixes: QBS-1575
Change-Id: Ib0f5c4a28cbeca5993ae9490f2d5f34dd355f05b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Task-number: QBS-1386
Change-Id: Ia432a0c78e1cccce586ed89f4235f41a55aef54c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ib1d8e5deb2d1ee2024032bd1ec9405fe0fa98848
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: Ic099d83336846289cdb651e34e00f711e40701c8
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: I53b88908bf82305dcc0a02178ca8da35069a8049
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
| |
Change-Id: Id3c2f6fddd0cc7d078963e50b07e0fb9b9ded5bb
Fixes: QBS-1577
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I34de8d7c14b3e7556d53af0274366b9fb720c6d7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|