aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: fix compilation for ios-simulator with Xcode 12v1.17.11.17Ivan Komissarov2020-10-262-1/+10
| | | | | | | | 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>
* Add changelog for 1.17.1Richard Weickelt2020-10-231-0/+9
| | | | | Change-Id: Ie4584b39080db3e2d2b87ca0fa1b73a6f807ef97 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Remove targetName suffix from QtApplicationRaphaël Cotty2020-10-234-8/+7
| | | | | | | | | | | | | 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-215-42/+71
| | | | | | | | | | | | 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-214-3/+90
| | | | | | | | | | | 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>
* Bump version to 1.17.1Richard Weickelt2020-10-131-1/+1
| | | | | Change-Id: I42518663555a503e2bc3dea9b33fc604cbee51e2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add new icon to chocolatey packagev1.17.0Richard Weickelt2020-09-012-1/+1
| | | | | | | Fixes also the broken link in the nuspec file. Change-Id: I0da24c19eb388a8377772fa3f1115a6afba31777 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add changelog for 1.17.0 releaseRichard Weickelt2020-08-251-0/+98
| | | | | Change-Id: I13bb24c875a2a2fb3503ea5344171267b74bf706 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix compilation for KEIL ARM examplesDenis Shienkov2020-08-213-0/+9
| | | | | | | | | 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>
* examples: fix license headersIvan Komissarov2020-08-178-90/+265
| | | | | | | We use different license for examples Change-Id: Ia0ceb7c36997185ac1cae6c72fc9873bfd0b15fe Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix passing compiler defines to mocIvan Komissarov2020-08-177-1/+82
| | | | | | | | | 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>
* Replace wrong continue statement with returnRichard Weickelt2020-08-141-1/+1
| | | | | Change-Id: Ia764530de200b80acf833e0e9ffc751b1988756c Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Tune search order of path probesIvan Komissarov2020-08-136-12/+35
| | | | | | | | | | | | | | | | | | | | 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>
* baremetal: Fix detection of ARM architecture details for KEIL armclangDenis Shienkov2020-08-131-0/+1
| | | | | | | | | | | | | | | 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>
* Tune branch filter to exclude only CI branchesRichard Weickelt2020-08-131-5/+5
| | | | | | | | 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>
* baremetal: Pass 'compiler-listing-files' test for KEIL ARM toolchainDenis Shienkov2020-08-133-3/+12
| | | | | | | | | | | 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>
* baremetal: Pass 'compiler-listing-files' test for SDCC toolchainDenis Shienkov2020-08-134-11/+44
| | | | | | | | | | | | | 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>
* baremetal: Fix typo in cpp.optimization flags for IAR toolchainDenis Shienkov2020-08-121-2/+2
| | | | | | | | | 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>
* Implement cpp.generateCompilerListingFiles for MSVC toolchainDenis Shienkov2020-08-126-7/+24
| | | | | | | | | | 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>
* baremetal: Use 'input' target instead of 'product' targetDenis Shienkov2020-08-082-6/+6
| | | | | | | | ... to get value of cpp.generate{Compiler|Assembler}ListingFiles properties. Change-Id: Iefd1401ac475a7937843a80af021668f0241a8c7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Fix linker MAP file generation for KEIL C51/C251/C166Denis Shienkov2020-08-082-4/+15
| | | | | | | | | | | | 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>
* baremetal: Fix typos in input parameters for {linker|archiver} flagsDenis Shienkov2020-08-083-12/+12
| | | | | Change-Id: I7f88ab54dd3e8870b55bb3540250eb037d328206 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Add new 'generate-linker-map-file' testDenis Shienkov2020-08-076-3/+89
| | | | | | | | | | | | | 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>
* baremetal: Add new 'generate-compiler-listing-files' testDenis Shienkov2020-08-078-39/+113
| | | | | | | | | | | | | 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>
* Fix MinGW buildChristian Stenger2020-08-063-3/+18
| | | | | Change-Id: I9894098b05004bb99273e091e3d1821f88d7c4af Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix compiler listing generation for KEIL C166Denis Shienkov2020-08-061-1/+2
| | | | | | | ... because the KEIL C166 compiler completely supports this feature. Change-Id: I86c2a6fdf485fd7c01544d44a4b2fc8b5401a7ad Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add XFAIL-ing autotest for newly discovered bugChristian Kandeler2020-08-054-0/+22
| | | | | | Task-number: QBS-1576 Change-Id: I333164e160655492c1378d96673fc8c8ab6f6330 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Add new 'defines' testDenis Shienkov2020-08-054-0/+25
| | | | | | | This test checks the cpp.defines property. Change-Id: If5ba39ef48c91147b883b2fe0dcab894b54e3cdb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Add new 'external-static-libraries' testDenis Shienkov2020-08-047-0/+81
| | | | | | | | | | | | | | 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>
* baremetal: Introduce new 'none' choosing for qbs.targetPlatformDenis Shienkov2020-08-047-0/+46
| | | | | | | | | | | | | | | | | 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>
* Android: Do not append the version number to a library nameChristian Kandeler2020-08-042-0/+2
| | | | | | | | Only the ".so" suffix is supported on Android. Fixes: QBS-1578 Change-Id: Idebece5338a765e779ff987fd89af66977ecc0fe Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* ModuleLoader: Fix scope for RHS of module provider property bindingsChristian Kandeler2020-08-042-2/+2
| | | | | | | | The scope should be the product item itself. Fixes: QBS-1587 Change-Id: Iccdc89e3b57d6ee1f11205961cf6244ea560f425 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Fix static library generation for GCC compilerDenis Shienkov2020-08-043-4/+3
| | | | | | | | | | | | | | | 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>
* xcode: Fix rpaths example for XCode 9.4Ivan Komissarov2020-08-041-0/+3
| | | | | Change-Id: Id25b339ddab14bb7c1fac68a747e94b1ac3ba58d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* xcode: add 'macosx-arm64' profile to the list of auto-created profilesIvan Komissarov2020-08-031-0/+2
| | | | | | | | 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>
* baremetal: Use checking on host OS in SDCC workaroundDenis Shienkov2020-08-021-1/+1
| | | | | | | ... because using target OS has not sense for a bare-metal toolchain. Change-Id: I266a11a3de62443b9a4b5aef88707cc4ddfd0635 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* baremetal: Disable position-independent code generation in a testsDenis Shienkov2020-08-012-0/+2
| | | | | | | ... because it is not supported on most bare-metal platforms. Change-Id: I40900f78255f0c6c2553d5b0f575de085b7a0b1f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* doc: Document more cpp module propertiesIvan Komissarov2020-07-312-3/+126
| | | | | | Fixes: QBS-1304 Change-Id: Ie7d2c4827119dbdc6c807c56912431fb3111f712 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: add how-to about debugging qbs scriptsIvan Komissarov2020-07-311-0/+38
| | | | | | | Change-Id: I968b45787cc5e410a6d58bfd092213118051e57a Fixes: QBS-1318 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* xcode: Fix ApplicationExtension with XCode 12Ivan Komissarov2020-07-301-1/+4
| | | | | | | | | 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>
* Fix data race when calling LauncherSocket::isReadyIvan Komissarov2020-07-303-18/+20
| | | | | | | | 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>
* Fix TestApi::disappearedWildcardFile()Christian Kandeler2020-07-291-0/+1
| | | | | | | ... for file systems with low timestamp resolution. Change-Id: Ie94543c229d912e79442399dbf095d9b77b8e1d4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* doc: add links to "Custom Modules and Items" page from qbsSearchPathsIvan Komissarov2020-07-292-2/+8
| | | | | | Fixes: QBS-1575 Change-Id: Ib0f5c4a28cbeca5993ae9490f2d5f34dd355f05b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: add link to the Installing page from the Building Applications pageIvan Komissarov2020-07-291-0/+3
| | | | | | Task-number: QBS-1386 Change-Id: Ia432a0c78e1cccce586ed89f4235f41a55aef54c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Pass 'one-object-asm-application' test for GCC RXDenis Shienkov2020-07-292-0/+10
| | | | | Change-Id: Ib1d8e5deb2d1ee2024032bd1ec9405fe0fa98848 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Pass 'one-object-asm-application' test for GCC AVR32Denis Shienkov2020-07-292-0/+10
| | | | | Change-Id: Ic099d83336846289cdb651e34e00f711e40701c8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Pass 'one-object-asm-application' test for GCC RISC-VDenis Shienkov2020-07-292-0/+13
| | | | | Change-Id: I53b88908bf82305dcc0a02178ca8da35069a8049 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* qt6: Update cpp.cxxLanguageVersion in Qt templatesIvan Komissarov2020-07-281-1/+3
| | | | | | Change-Id: Id3c2f6fddd0cc7d078963e50b07e0fb9b9ded5bb Fixes: QBS-1577 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* protobuf: suppress warnings in addressbook_cpp exampleIvan Komissarov2020-07-282-2/+9
| | | | | | Change-Id: I34de8d7c14b3e7556d53af0274366b9fb720c6d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>