aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix protobufobjc.qbs1.16Ivan Komissarov2020-05-191-17/+6
| | | | | | | | | | | Qbs complained about using undefined as a value for cpp.includePaths if objc module was not found Also, get rid of the Properties items as they are not reliable in modules Change-Id: Ifd0088e8a6da09f4befc20a43e8d7da7f32fcf31 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove deleting trailing slash from VS env varsSergey Zhuravlev2020-05-191-2/+0
| | | | | | | | | | | | | After launching msbuild from QBS I got an error "LOGGERBASEDEXECTASK : ILC error ILC1004: Directory 'C:\Program Files (x86)\Windows Kits\10lib\10.0.15063.0\um' passed to argument 'targetplatformsdklibpath' does not exist.". Seems those trailing slashes are important. Change-Id: I2839d7054c866207bbaeef3e21a4ea6a9679f477 Fixes: QBS-1551 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Do not use undefined properties in protobufcpp.qbsIvan Komissarov2020-05-191-4/+8
| | | | | Change-Id: Ie3a65702ba7604984bc3c4d456a2c6999e1d4925 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix TestBlackbox::installLocations for mingwIvan Komissarov2020-04-282-3/+13
| | | | | | | | Mingw uses ".debug" files instead of the ".pdb" files for the separated debug info Change-Id: I00d338f797200c0dba0a1cc115e0dc1b2d057416 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix TestApi::localProfiles() for mingwv1.16.0Christian Kandeler2020-04-241-3/+3
| | | | | | | This test needed adaptation due to the change in d1ad96d31b. Change-Id: Ie5a0f2bbc4c939494ab499971f0f54fa811cecd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* GCC: fix detection of Mingw prefix in MXEAlberto Mardegan2020-04-152-1/+8
| | | | | | | | | | | | | | | | The toolchain paths in MXE are of the form $MXE_PATH/usr/bin/x86_64-w64-mingw32.shared-g++ so we should not assume that what follows the dot is an extension that needs to be stripped (like QFileInfo::completeBaseName() does). Instead, only strip the know executable extensions. Change-Id: I51040d65e372ef3152ddd9229dd33011661c2b46 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* Add changelog for the 1.16 releaseRichard Weickelt2020-04-151-0/+126
| | | | | Change-Id: Ifaca92559983990b52064edf7ef85fb7a4569bca Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Session handling: Do not ignore return value of I/O functionsChristian Kandeler2020-04-151-4/+12
| | | | | | | | ... on Windows. Task-number: QTCREATORBUG-23839 Change-Id: I7b2bc8318dd5fe39583bc7ed0367425e1d062171 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs session: Keep checking whether stdin is still presentChristian Kandeler2020-04-151-1/+13
| | | | | | | | | | | | Otherwise, we will continue to lock the build directory if the controlling process dies. This patch implements the solution for Unix. The Windows one will follow shortly. Task-number: QTCREATORBUG-23839 Change-Id: I95ca7f6666e520c78521af1e85b765bc2e266e0f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not hardcode qbs.targetPlatform in CocoaTouchApplication.qbsIvan Komissarov2020-04-141-4/+1
| | | | | | | | | To be able to choose between ios and ios-simulator. Same applies to qbs.architecture, pick it from the given profile Change-Id: I695c87d187dc5fd01cb1ae52ec146f76ad2899f8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* session: Fix reading values from JSONIvan Komissarov2020-04-131-3/+3
| | | | | | | | | | Apparently, QJsonObject.isNull() returns false in case if key is not present in the map. This leads to wrong default values e.g. in case of the "fallback-provider-enabled" key. Fixes: QTCREATORBUG-23852 Change-Id: Idc85b3fd3a21fc4ce704c112c8c5b7a842cf57ba Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Enable coredumps on macOSRichard Weickelt2020-04-072-0/+11
| | | | | | | | | This patch enables backtraces in case a program crashes during the build/test. We want to see the backtrace of Qbs when it crashes. Change-Id: Ie90f805a68ca9b2d01644b25e81d4d60ab467d0c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Exclude VariantValues when checking for conflictsRichard Weickelt2020-04-061-1/+3
| | | | | | | | | | | | | Qbs prints a warning when different modules contain conflicting assignments to scalar properties. This check assumed that the source values were always of type JSSourceValue and thus performed a invalid static cast which caused sporadic crashes on macOS in TestLanguage::moduleMergingVariantValues. No crashes were obtained on other platforms, but that was only a coincidence. This patch amends 8ff1dd00. Change-Id: Id4809496a5fbc4985d040118a4684f3ac040cdc0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix accessing temporary object dataIvan Komissarov2020-04-061-3/+3
| | | | | | | Dectected by the 'clazy-returning-data-from-temporary' check Change-Id: I2ab979bb1d58ea96a36d0331aeffa6a719d2f423 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix helloworld-complex in "profiling" build on WindowsIvan Komissarov2020-04-062-3/+3
| | | | | | | | | _DEBUG macro is used by the MSVC compiler internally to enable/disable some features (like debug iterators) and defining it manually leads to obscure compilation errors Change-Id: I10e79ccbbfd40fe378fe9b754ecfc6066497eee5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Darwin: Adapt to Xcode 11.4Christian Kandeler2020-04-064-32/+29
| | | | | | | | | | | | The "Version" entry in SDKSettings.plist has three digits now. Also adapt the deploymentData autotest to take into account that we no longer pass the "version_min" options. Fixes: QBS-1543 Change-Id: Ibc1bcfd44583721c4bed1db812eca892ee316eeb Reviewed-by: Leon Buckel <leon.buckel@clausmark.com> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix autodetecting mingw compiler in PATHIvan Komissarov2020-04-032-13/+18
| | | | | | | | | | | | | | | GccBinaryProbe failed to locate g++.exe since it tried to append ".exe" suffix which is already present in filename. Also, fix the emptyProfile() test by setting the qbs.toolchainType instead of read-only property "qbs.toolchain" which cannot be assigned from the command line. Also, prepend the original cpp.toolchainInstallPath value to the PATH variable to make sure Probe will find the desired compiler. Change-Id: I12341ee1cd4d8ea0cbcdf3781347bfc0a2780ad2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add mention about all supported architecturesDenis Shienkov2020-03-311-0/+96
| | | | | | | Change-Id: Ia09a3ca5f8f6b44a408b2fa190f9fa59b198637b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Export framework search path in qtscxml blackbox test on macOSRichard Weickelt2020-03-311-9/+13
| | | | | | | | | | | | | | | | | | | The qtscxml testcase builds a Qt binary and runs it. This relies on library search paths being correctly exported so that the Qt libraries and framework files are found by the binary. The testcase exports LD_LIBRARY_PATH, but does neither export DYLD_LIBRARY_PATH nor DYLD_FRAMEWORK_PATH which is needed on macOS as well. Therefore the binary cannot be loaded. This error is only visible when running tst_blackbox-qt stand-alone. It is usually hidden because the QbsAutoTestRunner exports both DYLD variables. But if the user builds the autotests against Qt installation A while testing installation B, then the binary in the qtscxml testcase uses the wrong DYLD_LIBRARY_PATH. This patch exports both DYLD_LIBRARY_PATH and DYLD_FRAMEWORK_PATH on macOS. Change-Id: I348d50ec0417e35ff379aad2f93cf80b5ed50c95 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* LibraryProbe: extend search pathsIvan Komissarov2020-03-301-4/+29
| | | | | | | | | | This allows to search for libraries in Linux-specific directories such as /usr/lib/x86_64-linux-gnu on Debian. This also enables auto-testing protobufcpp module in Travis for Linux Change-Id: Ib8628bbbb25846d1338676619ffc8b3f15cf67b1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Provide info about Library itemIvan Komissarov2020-03-306-80/+165
| | | | | | | | Also, document the installDebugInformation and debugInformationInstallDir properties Change-Id: I7f98590cfb0c2194f9f64ce8aecac0095ec465d0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add info about LibraryProbeIvan Komissarov2020-03-301-0/+62
| | | | | | Task-nubmer: QBS-1187 Change-Id: Iaf91ebc1bdf8013806e74b7fc251b4749f464fb5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix grpcIncludePath in protobufcpp.qbsIvan Komissarov2020-03-301-1/+1
| | | | | | Fixes: QBS-1542 Change-Id: I9eac0cbedb1d9b2f1cfa686ac75b1ba189d6990e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Do not use app.qmltypes anymoreMaximilian Goldstein2020-03-303-5/+6
| | | | | | Task-number: QTBUG-82710 Change-Id: Ibb7c94c4f5de7ecc2dc45634a31d88b3cf55b881 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Doc: Document cpp::compilerVersion propertyDenis Shienkov2020-03-301-0/+9
| | | | | | Change-Id: I0fc96e94dad773b9a827e4b1fea7a3e2089332a2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix wrong property name in code snippetRichard Weickelt2020-03-261-1/+1
| | | | | | | | | The property has been renamed while writing the documentation and this location has not been updated. Change-Id: Ib8c26e95addd12015b9c1c3726276fc18fda2cd4 Fixes: QBS-1541 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use docker-compose exclusively for managing Docker imagesRichard Weickelt2020-03-264-110/+28
| | | | | | | | | | | | | | | | | | Qbs used to have docker products and a module for building the images, but this became obsolet and was superseded by the docker-compose infrastructure. Docker-compose is a much better fit for our use-case (which is mostly CI). It allows us to use unique (and complicated) tags both when building and running the images without exposing that to the user. Unique tags like bionic-5.12.6_1.14.1-2 instead of just bionic ensure that changes in the infrastructure don't suddenly break builds in older branches using the same image. This patch also updates the documentation to emphasize the usage of docker-compose. Change-Id: I45335d37034d10dda5ab5079ee3be1f81cb3e5c5 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove Debian stretch from Docker build environmentsRichard Weickelt2020-03-243-153/+0
| | | | | | | | | We have not been able to build Qbs with it for a while and it was superseded by Ubuntu Bionic. Change-Id: I8fe0d40baf8f522d4fd0b94a0b403b324c300e74 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: fix greenblink example with old sdcc compilerIvan Komissarov2020-03-231-0/+3
| | | | | | | There is no NOP macro defined in mcs51/compiler.h, provide a fallback. Change-Id: Ifaeb8b54ec87e05f6bb4ba5060e1b18a2c94c78e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* baremetal: Fix detecting older sdcc compilerIvan Komissarov2020-03-232-8/+41
| | | | | | | | | | | | Ubuntu Bionic has slightly older compiler version (3.5.0) which doesn't have macros that are used to detect compiler version. But it has the "__SDCC" macro containing the value "3_5_0". Use that as a fallback. Change-Id: I0bac78b684e64f11d00f8d915f806f7662d99766 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Convenience items can now install separated debug infoIvan Komissarov2020-03-206-9/+91
| | | | | | | | | | | | | | | This patchset adds the 'installDebugInformation' and 'debugInformationInstallDir' properties to the NativeBinary item and adds Group items that install debug info to the Library and Application items. Also, update How-To about installing debug symbols More documentation (for the Library and the NativeBinary items) will be added in a separate patchset Change-Id: I32687b99871fe40a8e26db09aa118a89ae73f922 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add info about first capital letter in custom items file namesIvan Komissarov2020-03-201-0/+2
| | | | | | | Task-number: QBS-667 Change-Id: Ia3f946c0bf4c4047f1dc15044d68f554a8a73a21 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Refactor TestBlackbox::installLocations()Ivan Komissarov2020-03-201-21/+38
| | | | | | | To be able to test debug info directories Change-Id: Ifde3ceef40e3face12c40e670675c641d42a561e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix crash in operator==(ArtifactProperties, ArtifactProperties)Ivan Komissarov2020-03-202-0/+2
| | | | | | | | Also, make operator==(SourceArtifactInternal, SourceArtifactInternal) more robust Change-Id: I2eb276621d304c7ac5fa7c78af00db09b0c2e3c4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Darwin: Fix access to undefined moduleChristian Kandeler2020-03-191-1/+2
| | | | | | | Amends cf5562823e. Change-Id: I5844815342f9e2eae131c1d2cd94ad8119d0dcfe Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* doc: Fix previous page in application.qdocIvan Komissarov2020-03-181-1/+1
| | | | | Change-Id: Ib007bf500b4aa11d2e0a9c3422b2ac693eb8c29c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: fix CppApplication base classIvan Komissarov2020-03-181-2/+2
| | | | | Change-Id: Ic368cdc22d8b551af1e000357c79831834499948 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Make Library.qbs configurableIvan Komissarov2020-03-186-31/+63
| | | | | | | | | | Move all tag installation code to the Library.qbs to make it possible to switch between dynamic/static libraries in user code. Also, add test for the LoadableModule item. Change-Id: I947977e5974f9c37d27be6ccd7ad3d117a05af18 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix some typos in README files of examplesDenis Shienkov2020-03-172-2/+2
| | | | | | Change-Id: I5fac5a0a690b9302276acddb502c6be6b9492b60 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix typo for STM8 assembler file tagging in SDCC toolchainDenis Shienkov2020-03-171-1/+1
| | | | | | Change-Id: I6a1eac610eb7af8c0ee3e09f5ce2a48a2cf58ba2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Fetch ARM architecture details from KEIL toolchainDenis Shienkov2020-03-171-41/+44
| | | | | | | | | | | | | | Previously, we did not take into account the specific architecture of the target processor and always returned the abstract "arm" name. Right now we handle the '__TARGET_ARCH_ARM' and '__TARGET_ARCH_THUMB' pre-defined macroses to extend the ARM architecture name, using the table 9-22: * http://www.keil.com/support/man/docs/armcc/armcc_chr1359125007083.htm Change-Id: Iad972d5f0ee330295b84ff7841ac25f40551dfb8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix target ARM architecture condition in an examplesDenis Shienkov2020-03-171-1/+1
| | | | | | | We need to use .startsWith("arm") instead of .contains("arm"). Change-Id: I521eea231313ce79132ff30a3a05eed629f33b06 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update windowsservercore Docker imageRichard Weickelt2020-03-175-62/+87
| | | | | | | | | | | | | Qt is updated to 5.12.5, MSVC is updated to 2017. Qbs is updated to 1.15.0. Docker-compose is used for managing the image. A unique tag name is used instead of the generic windowsservercore tag to be always able to refer to a specific version. Docker-compose is now used for managing the image. Change-Id: Ia5733992e7692561b1a6e74a4ac2ea3a7a01c4d8 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas 78K architectureDenis Shienkov2020-03-161-2/+6
| | | | | | Change-Id: I659c1f4c9f367af7f77069264082cb30a836679f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add IAR Renesas 78K toolchain supportDenis Shienkov2020-03-161-7/+28
| | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the Renesas 78K processors family: * https://www.renesas.com/cn/en/products/microcontrollers-microprocessors/78k.html Change-Id: Ie1c9cbaaf7d1c883115129ebb54c1efb74e6c5ee Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas V850 architectureDenis Shienkov2020-03-161-2/+7
| | | | | | Change-Id: I7862904f26a8e4c807d10cb1b136aba6eabbba55 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Add IAR Renesas V850 toolchain supportDenis Shienkov2020-03-161-0/+19
| | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the Renesas V850 processors family: * https://www.renesas.com/cn/en/products/microcontrollers-microprocessors/v850.html Change-Id: I289b2c9718ea917b04a1f14a3d2c70f4f26359d8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas RH850 architectureDenis Shienkov2020-03-161-2/+6
| | | | | | Change-Id: I4fe50d4d5d4b2a544d4f726ae3f4532763c1d11b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add IAR Renesas RH850 toolchain supportDenis Shienkov2020-03-161-0/+18
| | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the Renesas RH850 processors family: * https://www.renesas.com/eu/en/products/microcontrollers-microprocessors/rh850.html Change-Id: Iefa12ededbae78db2e376eca536534b8539f4c1d Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix endianness flag detection for IAR toolchainDenis Shienkov2020-03-161-1/+3
| | | | | | | | An endianness supported only for ARM and Renesas RX architectures. Change-Id: Ia2a60c9ef99bf20ec1ce29ba6e6c345ebc88277d Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 05:43:08 +0000