| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
We don't need in multiple test data instances (*.qbs) for each property,
because we can pass the required properties from the C++ code directly.
Change-Id: I3bc05db5f6c0d2533f9799cbadb830c0c687e1e5
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
| |
We should only sign the resulting binary during the lipo step.
Change-Id: If4d508bcdf347bf2fc68d345ed8d5913a7457f8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: If8d579b612d8c44f697495d2ca985f7c34310682
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
|
| |
Some of those tests require Qt.script headers which are used in
corelib's headers. Introduce a new QbsUnitTest item type that pulls in
the dependency on Qt.script/scriptengine for those tests.
Change-Id: I5b981b910191ba690eded14bdf64b540f334bd53
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
| |
Otherwise the profile is not removed from settings after the test is
finished
Change-Id: Ib82f35f7f468733ad4d2c28ce15da59af9024697
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|\
| |
| |
| | |
Change-Id: Ia45a5502f2d3c30807b5cab14666070973654b3a
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Session class is located in the binary itself, not in the corelib, so we
need to pass this macro there as well. Do that by making this macro
"public" as Qbs build does.
Task-number: QTCREATORBUG-25232
Change-Id: I50b2f8a533db82cf28fd5d29c17fcfdc410c5ab2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
We need to pass the C and C ++ compiler flags because the
new `compilerDefinesByLanguage ()` test uses the `cpp` files.
Change-Id: Ic813e74da3bccbed60a55052d546c1de69a408d8
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|\|
| |
| |
| | |
Change-Id: I4e437865514add88558f66420718bc02fb39e41d
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After we did remove the hpp tag from the java-generated header, it was
re-added by a file tagger in the cpp modules file, leading to an
unexpected state on rebuilding.
Fix this by replacing the tag, rather than removing it.
Fixes: QBS-1628
Change-Id: I9d182cd30cf9a637733b84234e7a0b37f7583334
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ied6d9eac49fcb20de72499ab7c39e83a90a98b75
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This moves code signing functionality into a dedicated module, and also
implements automatic provisioning for Apple platforms, which
automatically selects appropriate signing identities and provisioning
profiles based on the product being built.
This also results in a significant performance improvement since all
code signing setup information is retrieved in process instead of
forking off the openssl and security command line tools.
Task-number: QBS-899
Change-Id: I60d0aeaeb2d1004929505bcb1e0bc77512fe77bc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Array.isArray() seemed to work for arrays created in scripts as well as
for QStringList and QVariantList created in C++ when using QtScript.
QJSEngine is more strict (see the comments in QTBUG-45018). One way to
work around that problem is to use instanceof Array instead.
Change-Id: I0f1c8757a5ab2f82e26eff19a8b5ecf667bb04b1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The current QtScript implementation seems to leak variables of the
prepare script context to invoked JS functions. This will become an
error in the JS port.
Change-Id: If4b43e6162b4c3ea1f1ec8f118474064dc9586c0
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The current QtScript implementation does not warn about missing import
statements in some cases. Imported .js files should never inherit
imports. This will become an error in the JS port.
Change-Id: I880afabba64c0766063304c723242e242ac89b81
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: If2d249031a5fc1f1fdcdb0414d9cf43607505bf4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This test is an adaptation of a similar existing test. A main
difference it that this test intended only for a `bare-metal`
toolchains where there may be no support for a C ++ compiler.
Change-Id: I4ea023743a4940c96dd9abc96ffda8cd06385b0b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... to pass the C++ tests.
Because we don't use the linking with the standard libraries in a tests,
otherwise linking will fails.
Change-Id: Ibde09c384fb70626109b357144a7e27a1a6b6e5b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I7ff8886cb14dee195a6d5af9173ca853f8455bed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I9a7a0239370ff3d309dc91868b2058cc6616149c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It makes sense to store platform-specific flags in one place, for
example, in BareMetalProduct. And then to inherit the applications
and the libraries from this common product. This solution minimizes
the copy/paste errors and make a tests code easier to maintain.
Change-Id: Iaf11be9d6f983e8ce542787d42e8b7ef050b1903
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I2112e6bdca36b07502b571841528bb2734f41da0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ibe06e30dd3ad88f11b0fab79bb718e7c9b9155b9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I94c678f2ef224abd6b751615f8d3e900deda5be8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I8a43dce0ef2731c4d181fe529f5bd4cf40ea12cf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I0fde96241231e3a4d46c2892daadf4036be173c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The IAR compiler has an undocumented command line option `--IDE3`,
which allows you to print a list of compiler include paths as:
`$$TOOL_BEGIN $$VERSION "3" $$INC_BEGIN $$FILEPATH "<path\\to\\directory>" $$TOOL_END`
Besides, the same approach is used in the IAR extension for
the VSCode IDE.
So we can use this approach to implement it the Qbs module as well.
In addition, this commit contains an autotest to check the
`cpp.compilerIncludePaths` property.
Change-Id: I434dd630913e5afd6cba5b4e31e1021ee0c5fe31
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|\|
| |
| |
| | |
Change-Id: I37c359289dcd957fbc964a35fab381a047f7d04a
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This test verifies the possibility to use "*.appiconset" assets for
application icons
Task-number: QBS-1627
Change-Id: I2480dcb76d046d91333295926db40cdd6d4c32bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I94755e03572003275483a4bac95660a007dff0bc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To make use of nanopb specific options defined in a separate `.options`
file pass import paths to nanopb generator script. This is needed because
protoc doesn’t currently pass include path into plugins. Therefore if
your .proto is in a subdirectory, nanopb may have trouble finding the
associated .options file.
Change-Id: I28eb2e9c2f353df88aa1a1e772dfb57a36800434
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| | |
Xcode 12.2 supports building arm64 mac binaries (again)
Change-Id: Iacdeda5d0b933781694cab0e38f720ee2ffe3461
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: If77ea1a92f64a4b6910c4755aa03dd96ec5078fb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Running moc in the aggregate can't happen anymore because it generates
an error when accessing cpp.defines.
Before 527d5a8ec54e44291d4968754bdf574ebe57822b cpp.defines was not
accessed for hpp files. Anyway it doesn't make sense to call moc
in the aggregate as the generated files won't be compiled.
Change-Id: I25ada3c8c54b199efb0877b59025fff88dc84dd8
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I585fe2646339a7d7454570638bef2ad5e9ab502a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Manage the new directory layout of Qt6.
Update generation of the input file for androiddeployqt.
Fixes: QBS-1613
Fixes: QBS-1609
Change-Id: Ie633fad467f310bfc4cd42e9c32d9cfc2e734582
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|/
|
|
|
| |
Change-Id: I62cdb64182cc9226bfecc00765e8197e4a1fd441
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Default Xcode was switched to 12.0 and we need to use Qbs 1.17 which
supports it
Change-Id: I4dfb0da7e1bdf99dd1fafe952395465dc8cdb267
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
========== Performance data for Resolving ==========
Old instruction count: 10195378481
New instruction count: 10238464294
Relative change: 0 %
[ChangeLog] Qbs now checks string and stringList values according to the
allowedValues property in PropertyOptions
Change-Id: Ide88987c74b35f4172ffaf71aacd991536131ee5
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I0db7d7104cd06521291970a51ddf0a6f55cc71a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Should be "profiling", not "profile"
Change-Id: I79f1607a4a1880a67bb49b08dfabbe0a5715aaa7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ifcd65b201f060506d53dcffc0031d186a6dc227e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: I404ac10a14517763daf656dd38dd560534cbf1fa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Fixes: QBS-1601
Change-Id: Iead18bf5fd25f965cf9f9748469f2469488eabc8
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ib3bba4468bdf8851e61f48eecea597ae552c7647
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reduces execution time to 1s (was 10s) and simplifies PathProbe
debugging because the cpp module contains probes as well.
Change-Id: Iddd4de71143892d6815acbd1efff30f92d70a423
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|