aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* baremetal: Improve 'linker-map' testDenis Shienkov2021-04-015-26/+11
| | | | | | | | 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>
* codesign: do not sign intermediate products when multiplexingIvan Komissarov2021-03-304-6/+29
| | | | | | | We should only sign the resulting binary during the lipo step. Change-Id: If4d508bcdf347bf2fc68d345ed8d5913a7457f8d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Run appleMultiConfig test with arm64 on newer XcodeIvan Komissarov2021-03-211-7/+14
| | | | | Change-Id: If8d579b612d8c44f697495d2ca985f7c34310682 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix building unit tests with bundled Qt.scriptIvan Komissarov2021-03-173-8/+3
| | | | | | | | | 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>
* Use TemporaryProfile in TestBlackbox::qtBug51237Ivan Komissarov2021-03-041-8/+6
| | | | | | | | Otherwise the profile is not removed from settings after the test is finished Change-Id: Ib82f35f7f468733ad4d2c28ce15da59af9024697 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge branch '1.18' into masterIvan Komissarov2021-03-021-1/+0
|\ | | | | | | Change-Id: Ia45a5502f2d3c30807b5cab14666070973654b3a
| * cmake build: Fix project files updates in Qbs binaryIvan Komissarov2021-03-021-1/+0
| | | | | | | | | | | | | | | | | | | | 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>
* | baremetal: Pass tests for IAR 78K toolchainDenis Shienkov2021-02-281-1/+1
| | | | | | | | | | | | | | | | 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>
* | Merge branch '1.18'Ivan Komissarov2021-02-1914-9/+156
|\| | | | | | | Change-Id: I4e437865514add88558f66420718bc02fb39e41d
| * Qt/Android: Extend rule cycle prevention hackChristian Kandeler2021-01-263-4/+71
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Add qt4 docker image for basic testingRaphaël Cotty2020-12-1811-5/+85
| | | | | | | | | | Change-Id: Ied6d9eac49fcb20de72499ab7c39e83a90a98b75 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Implement codesign moduleJake Petroules2021-02-187-4/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | qt6: fix -Wformat warningsIvan Komissarov2021-02-161-2/+2
| | | | | | | | | | Change-Id: Ia4107e6afdd94df06b4957317881768f4259c9d2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Test for array-like objects with instanceof ArrayRichard Weickelt2021-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | 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>
* | Do not rely on leaked context variablesRichard Weickelt2021-02-131-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | Add missing import statementsRichard Weickelt2021-02-131-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | baremetal: Pass tests for RISC-V architecture for GCC toolchainDenis Shienkov2021-02-111-0/+5
| | | | | | | | | | Change-Id: If2d249031a5fc1f1fdcdb0414d9cf43607505bf4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Add new 'compiler-defines-by-language' testDenis Shienkov2021-02-106-0/+82
| | | | | | | | | | | | | | | | | | 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>
* | baremetal: Add '-nostdlib' flag for MSP430 GCC toolchainDenis Shienkov2021-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | ... 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>
* | baremetal: Pass tests for ColdFire architecture for IAR toolchainDenis Shienkov2021-02-053-0/+26
| | | | | | | | | | | | Change-Id: I7ff8886cb14dee195a6d5af9173ca853f8455bed Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Pass tests for RISC-V architecture for IAR toolchainDenis Shienkov2021-02-053-0/+17
| | | | | | | | | | Change-Id: I9a7a0239370ff3d309dc91868b2058cc6616149c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Derive test application and library from base productDenis Shienkov2021-02-053-228/+131
| | | | | | | | | | | | | | | | | | | | 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>
* | baremetal: Pass tests for M32C architecture for IAR toolchainDenis Shienkov2021-02-053-0/+21
| | | | | | | | | | Change-Id: I2112e6bdca36b07502b571841528bb2734f41da0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Pass tests for RX architecture for IAR toolchainDenis Shienkov2021-02-052-0/+7
| | | | | | | | | | Change-Id: Ibe06e30dd3ad88f11b0fab79bb718e7c9b9155b9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Pass tests for HCS12 architecture for IAR toolchainDenis Shienkov2021-02-052-0/+9
| | | | | | | | | | Change-Id: I94c678f2ef224abd6b751615f8d3e900deda5be8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Pass tests for HCS08 architecture for IAR toolchainDenis Shienkov2021-02-043-0/+17
| | | | | | | | | | Change-Id: I8a43dce0ef2731c4d181fe529f5bd4cf40ea12cf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Pass tests for HCS08 architecture for SDCC toolchainDenis Shienkov2021-02-042-0/+8
| | | | | | | | | | Change-Id: I0fde96241231e3a4d46c2892daadf4036be173c4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Improve detection of IAR compiler includesDenis Shienkov2021-02-024-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch '1.18'Ivan Komissarov2020-12-1839-1/+352
|\| | | | | | | Change-Id: I37c359289dcd957fbc964a35fab381a047f7d04a
| * Add TestBlackboxApple::appiconset testIvan Komissarov2020-12-1435-0/+341
| | | | | | | | | | | | | | | | | | 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>
| * Fix assetCatalog test for macOS 11.*Ivan Komissarov2020-12-141-1/+2
| | | | | | | | | | Change-Id: I94755e03572003275483a4bac95660a007dff0bc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Pass import paths as nanopb_opt to support `.options` filesKai Dohmen2020-12-033-0/+9
| | | | | | | | | | | | | | | | | | | | | | 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: brings back arm64 mac in aggregateDependencyLinking()Ivan Komissarov2020-12-071-1/+1
| | | | | | | | | | | | | | Xcode 12.2 supports building arm64 mac binaries (again) Change-Id: Iacdeda5d0b933781694cab0e38f720ee2ffe3461 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge branch '1.18' into masterRichard Weickelt2020-11-286-82/+208
|\| | | | | | | Change-Id: If77ea1a92f64a4b6910c4755aa03dd96ec5078fb
| * Disable moc for the aggregate product when multiplexingRaphaël Cotty2020-11-264-4/+31
| | | | | | | | | | | | | | | | | | | | | | 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>
| * macOS: Fix getNativeSetting() test on Big SurIvan Komissarov2020-11-201-4/+8
| | | | | | | | | | Change-Id: I585fe2646339a7d7454570638bef2ad5e9ab502a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Android: Update for Qt 6Raphaël Cotty2020-11-171-74/+169
| | | | | | | | | | | | | | | | | | | | 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>
* | qt6: use lambdas to pass callables to QtConcurrent::runIvan Komissarov2020-11-042-12/+16
| | | | | | | | | | | | | | | | It is not possible to use "this" as the 1st argument for run() method since it should be QThreadPool now Change-Id: I69d4291b8a748ea62de7e3b486f8e3e046cd38b4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: do not forward-declare QStringListIvan Komissarov2020-11-043-11/+3
| | | | | | | | | | | | | | It is a typedef to QList<QString> now, not a separate class Change-Id: I2f84d11f09b8c0db64f25bd0682bdc684b64018e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: do not use deprecated QByteArray::operator(QString)Ivan Komissarov2020-11-031-1/+4
|/ | | | | Change-Id: I62cdb64182cc9226bfecc00765e8197e4a1fd441 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: fix macOS buildIvan Komissarov2020-10-291-2/+1
| | | | | | | | 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>
* Implement missing check for allowed values in PropertyOptionsIvan Komissarov2020-10-284-1/+91
| | | | | | | | | | | | | | ========== 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>
* Xcode: fix apple-multiconfig test for ios-simulatorIvan Komissarov2020-10-261-2/+2
| | | | | Change-Id: I0db7d7104cd06521291970a51ddf0a6f55cc71a6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix qbs.buildVariant in appleMultiConfig() testIvan Komissarov2020-10-262-10/+10
| | | | | | | Should be "profiling", not "profile" Change-Id: I79f1607a4a1880a67bb49b08dfabbe0a5715aaa7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.17'Ivan Komissarov2020-10-261-40/+35
|\ | | | | | | Change-Id: Ifcd65b201f060506d53dcffc0031d186a6dc227e
| * Android: Remove targetName suffix from QtApplicationRaphaël Cotty2020-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Android: Fix Qt 5.14 (and 5.15)Richard Weickelt2020-10-221-4/+6
| | | | | | | | | | | | | | Amends 2f5f049e. Change-Id: Ifa77899b3f5b206c1436f6ad6baea4c4d7a238ed Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Android: Update for Qt 5.15Raphaël Cotty2020-10-211-40/+33
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Android: Allow exporting of Qt modules by using importingProductRaphaël Cotty2020-10-213-1/+80
| | | | | | | | | | | | | | | | | | | | | | 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>
* | clang-tidy: Apply modernize-use-nullptr fix-itIvan Komissarov2020-10-263-81/+81
| | | | | | | | | | Change-Id: I404ac10a14517763daf656dd38dd560534cbf1fa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 17:39:41 +0000