aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add a complete example for a Rule in a ProductIvan Komissarov2019-07-104-32/+65
| | | | | | | | | | Change-Id: I4739440cb90f7ef5795f79da053246f8071aa57e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add hasLibrary property to Qt.coreRichard Weickelt2019-07-091-0/+1
| | | | | | | | | | | | | | | | This allows us to treat Qt.core similar to other Qt modules based upon QtModule.qbs when bundling Qt libraries together with an application. Change-Id: I9ae54ec40c3fb7506181afbd437f4e2f03b02e41 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * doc: Fix JobLimit::jobCount typeIvan Komissarov2019-07-061-1/+1
| | | | | | | | | | | | | | | | Should be int, not string Change-Id: Ib0caaa1730125d6f6debbbfc4346fe4f29dba935 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Set cpp.minimumIosVersion to "6.0" by defaultIvan Komissarov2019-07-052-3/+6
| | | | | | | | | | | | | | | | | | This is required because earlier iOS versions are broken in recent XCode installations (at least, for XCode >= 7.0.0) Change-Id: Ib55e2eafcf26357695ab057da8109921518b7fea Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | bare-metal: Add example for STM8S103F3 boardDenis Shienkov2019-07-2611-4/+449
| | | | | | | | | | | | | | | | | | This commit adds a simple example for the stm8-based microcontroller which blinking of the red LED and can be built for IAR EW toolchain. Change-Id: I6df068b0a2104f7418ed01c6a8ca03b2f9aef3cf Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | bare-metal: Add IAR STM8 toolchain supportDenis Shienkov2019-07-264-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the STM8 processors family. To use it with Qt Creator, it is enough to add there a desired Kit with a custom IAR C/C++ compiler, and then set the following in the Kit's Qbs profile settings: * Key: qbs.toolchainType * Value: iar Tested with EW for STM8 v3.11.1 on Windows using the simple projects samples which come with the default IAR installer. Change-Id: Ibc116ceb33b7df49c3241d26fa97136255ba06dd Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | bare-metal: Auto-detect SDCC profiles for all supported architecturesDenis Shienkov2019-07-261-45/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous SDCC toolchain auto-detection algorithm based on an assumption, that the default target architecture always is MCS51. But, the SDCC compiler support multiple architectures: * http://sdcc.sourceforge.net/ A target architecture sets by the special command-line flag (f.e. -mmcu51 for 8051, -mstm8 for STM8 and so forth). As previously we have added the STM8 architecture support to the SDCC compiler, then it is reasonable to create a multiple SDCC profiles for one compiler for the different supported architectures. Right now, the SDCC compiler will be auto-detected as two instances: * with mcs51 architecture * with stm8 architecture Change-Id: I62949a30b770dab005628dc4fbd6ae67f5cf28ff Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | bare-metal: Add STM8 architecture for SDCC toolchainDenis Shienkov2019-07-262-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous implementation of SDCC toolchain based on an assumption, that the default target architecture always is MCS51. But, the SDCC compiler support multiple architectures: * http://sdcc.sourceforge.net/ So, it is makes sense to add support and for STM8 architecture to the SDCC toolchain. Change-Id: Ibbd32764fe2fac3e45fda93ac3d903c3619efb18 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Fix qbs-setup-toolchainsChristian Kandeler2019-07-241-2/+2
| | | | | | | | | | | | | | | | We must not insert empty tool file paths into a profile. Change-Id: Ic2f2815e011cd98e9c690348fb1a86c9be7f17de Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Refactor the GCC/Clang/MinGW compilers auto-detectionDenis Shienkov2019-07-234-90/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now the qbs-setup-toolchains can auto detect all installed compiler versions from the directories specified in the PATH environment variable. Also it tries to ignore all duplicate compiler executables found in same directory. F.e. if some directory contains two compiler names 'arm-none-eabi-gcc-9.1.0' and 'arm-none-eabi-gcc', and they are equal, then the compiler 'arm-none-eabi-gcc-9.1.0' with a longer name will be chose. Change-Id: I395dcbf79f4fc8d4653b1a51a751388a8d8d3f12 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add additional namespaces and ifdef guard prefixesDenis Shienkov2019-07-2237-177/+312
| | | | | | | | | | | | | | | | | | ... to avoid a possible future conflicts with a same class names (e.g. at attempt to add a new generators). Change-Id: Ib8c4218a7f76e2a001dd1354b7676a0843a109ea Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Long live the IAR EW project generator for 8051Denis Shienkov2019-07-1817-0/+2586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now it is possible to generate a native projects for the IAR Embedded Workbench IDE, e.g. using the following command: qbs generate -g iarew10 -d <path/to/build/directory> -f <path/to/qbs/project> profile:<your/qbs/profile> We need in a valid IAR EW QBS profile, from which the generator take a desired target architecture and other stuff. The IAR EW generator has a semi-intelligent logic, it parses a source QBS project and converts a compiler flags and other stuff to an appropriate configurations of the native IAR EW project. Currently it is supported only one 'iarew10' generator which allow to generate a projects for the IAR EW for 8051 for all versions of 10 series. Tested with the IAR EW for 8051 v10.10.1, using as the QBS bare-metal examples, and as other projects. Change-Id: If8a7397bebf6176010d42cfda41230e50a499a69 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qbs-setup-toolchains: Refactor and improve the code a bitDenis Shienkov2019-07-1613-44/+57
| | | | | | | | | | | | | | | | | | | | * Added 'QBS_SETUPTOOLCHAINS_' prefix to all ifdef guards. * Unified the parameters order for the createXyzProfile() functions. * Used QFileInfo instead of QString as a compiler path variable. Change-Id: Ib4cfafa8d5ad4fe9e8ca8b06e4cfc17eafc67626 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Move GCC/MinGW/Clang stuff to separate gccProbe moduleDenis Shienkov2019-07-156-185/+321
| | | | | | | | | | | | | | ... that simplifies a code bit. Change-Id: I4688e7b28986687d7cca5ad5fc8ab333cb50d8d2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix compilation errors with MSVC2015Denis Shienkov2019-07-151-0/+12
| | | | | | | | | | | | | | | | | | ... this regression was introduced in commit 808d246607b768ea4dc02e3ef0b178e058d6575c Change-Id: I8b4ea97060d99d4ef39aac8c05bdb438d50d1cc1 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix compare '<' operator for ToolchainInstallInfoDenis Shienkov2019-07-111-2/+7
| | | | | | | | | | | | Change-Id: Ie411f0f2316a46eb8e6d4b39f5f1e8c20d8927eb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Long live the IAR EW project generator for AVRDenis Shienkov2019-07-1117-0/+2419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now it is possible to generate a native projects for the IAR Embedded Workbench IDE for Microchip AVR architecture, e.g. using the following command: qbs generate -g iarew7 -d <path/to/build/directory> -f <path/to/qbs/project> profile:<your/qbs/profile> We need in a valid IAR EW QBS profile, from which the generator take a desired target architecture and other stuff. The IAR EW generator has a semi-intelligent logic, it parses a source QBS project and converts a compiler flags and other stuff to an appropriate configurations of the native IAR EW project. Currently it is supported only one 'iarew7' generator which allow to generate a projects for the IAR EW for AVR for all versions of 7 series. Tested with the IAR EW for AVR v7.20.1, using as the QBS bare-metal examples, and as other projects. Change-Id: Ic5811e579e86b868d5946637db9d8780ef47968b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Long live the IAR EW project generator for ARMDenis Shienkov2019-07-1150-2/+4925
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now it is possible to generate a native projects for the IAR Embedded Workbench IDE, e.g. using the following command: qbs generate -g iarew8 -d <path/to/build/directory> -f <path/to/qbs/project> profile:<your/qbs/profile> We need in a valid IAR EW QBS profile, from which the generator take a desired target architecture and other stuff. The IAR EW generator has a semi-intelligent logic, it parses a source QBS project and converts a compiler flags and other stuff to an appropriate configurations of the native IAR EW project. Currently it is supported only one 'iarew8' generator which allow to generate a projects for the IAR EW for ARM for all versions of 8 series. Tested with the IAR EW for ARM v8.20, v8.32, v8.40, using as the QBS bare-metal examples, and as other projects. Change-Id: I2aa24d5a635f1f5a0e645bec8c30053e960d90a3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Detect KEIL compiler version if it is found in a pathDenis Shienkov2019-07-091-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | Previously we have only the KEIL toolchain version detection from the Windows registry. This patch adds a compiler version detection in case the compiler path specified in a PATH environment variable. Change-Id: Ic3b183adbe4f655c18a2a96b7e30cba343f9d0d0 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Detect SDCC compiler version if it is found in a pathDenis Shienkov2019-07-091-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously we have only the SDCC toolchain version detection from the Windows registry. This patch adds a compiler version detection in case the compiler path specified in a PATH environment variable. Change-Id: I6a9b74efbd8e4a8cd7a596bdf4946745d820f7f9 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add Windows to Travis build configRichard Weickelt2019-07-082-3/+55
| | | | | | | | | | | | | | | | | | This patch enables Qbs builds and autotests on Windows. Builds in release mode to speed up test execution. Change-Id: Iaddfddb3459266740aa18c06d431624336446c6b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
* | Install colliding-mice example into the correct locationRichard Weickelt2019-07-081-2/+2
| | | | | | | | | | | | | | | | This example was still using installPrefix instead of installDir. Change-Id: Ia493b2a9b7c6fded6fc90321996730bfc8cd22e9 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Speed up TestBlackboxJobLimitsIvan Komissarov2019-07-083-3/+3
| | | | | | | | | | | | | | | | | | | | | | This test runs for quite a long time on Travis and is reason why jobs got killed. This patch decreases the spent time by 40% on macOS (~5min -> ~3min) Change-Id: Iaab8ba08f5b43c65655eaad61812def60047f581 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 1.14 into masterChristian Kandeler2019-07-0551-90/+1041
|\| | | | | | | Change-Id: I2796d53ca36ce90977f0a09ca5db089d8c85bd4e
| * baremetal: Fix typo in option to enable C++ language for IARDenis Shienkov2019-07-031-2/+2
| | | | | | | | | | | | | | | | | | We need to use the '--c++' option instead of '--ec++' to dump the macroses and headers for the C++ language. Change-Id: I545e661babc1ffa84ef189d28b2dd59be3cef29e Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * qbs build: Fix GCC 9 warnings triggered by Qt headersChristian Kandeler2019-07-021-3/+13
| | | | | | | | | | | | Change-Id: I7795cb20d7af1c5fd46d8cdbdc3fa46cad5963bb Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Fix compiling with project.withExamples:true on MacIvan Komissarov2019-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, if qbs.targetPlatform is set, it is desired to use a corresponding architecture (armv7 or arm64); otherwise x86_64 architecture is used. Second, when building in Qt Creator, xcode module can't be found (due to different profile settings) and sysroot is not set to point to the iPhoneOS.sdk which leads to unability to find some frameworks. Disable this example when using QtC. Change-Id: I9fe413e6feb8fe7cfc6ff2e58323b81d8bf06839 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Adapt to upstream introduction of std::hash<QString>hjk2019-07-011-0/+2
| | | | | | | | | | Change-Id: If6671dd7c7a68ac3e1728fcb1790e6abf7c0b019 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add sanity check to socket launcherChristian Kandeler2019-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | As far as I can see, this shouldn't happen, but let's prevent a crash at least in case it does. Task-number: QTCREATORBUG-22539 Change-Id: I4bd36364ca3f8bb8cdbe445e5b14037758b1e1fc Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Add support for gRPC to the protobuf.cpp moduleIvan Komissarov2019-06-2713-9/+556
| | | | | | | | | | | | | | | | This implements support for the gRPC framework: https://www.grpc.io Change-Id: Ia85461b9618e73827114c137fce8615e5a8139e3 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Enable project.withExamples in TravisIvan Komissarov2019-06-271-0/+1
| | | | | | | | | | | | | | | | | | This will allow to catch more build errors caused by breakage of backward-compatibility Change-Id: I49985d9c67cdc66d2ea5885685ce6a0f72e36dd4 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix TestBlackboxApple::infoPlist for tvos/ios/watchos platformsIvan Komissarov2019-06-261-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On non-desktop OSes, Info.plist is located in the other folder: infoplist.app/Info.plist instead of infoplist.app/Contents/Info.plist Plus, it uses binary format by default, so convert resulting file to JSON to simplify checking its contents Plus, some properties that are present on macOS are not present on ios/others. Check only common subset plus macOS-specific properties Change-Id: Ic709f6b79a5ecc89c3866ca69ca4004341dfad9f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Assume that libc++ is present on iOS if cpp.minimumIosVersion is not setIvan Komissarov2019-06-261-2/+2
| | | | | | | | | | | | | | | | Otherwise, tests fail to locate old c++ library on recent Macs. Change-Id: I6ff5ceb0753dea73a5da1c70cfeb97b848cb7948 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix TestBlackboxApple::xcode for tvos/ios/watchos platformsIvan Komissarov2019-06-262-8/+40
| | | | | | | | | | | | Change-Id: Ieed4b81a83e8b8a5c8c061f985587aded3e13ec3 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add PathProbe::candidateFilter propertyIvan Komissarov2019-06-269-13/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property can be used to check if candidate conforms with some conditions. For example, an architecture of a shared library candidate should match the current qbs.architecture. Also, this will allow to implement support for the "text based stub libraries" (yaml files that point to a real library in a system) on macOS - instead of checking real file architecture, it should be read from .tbd file Change-Id: Ie84a3e70d883dec949440358e2f08213a8501982 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Allow PathProbe to search multiple filesIvan Komissarov2019-06-2528-56/+348
| | | | | | | | | | | | Change-Id: I6ae2dd130cbafb03e51bc6e8e8a3e262d6d45fc6 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Use QBS_LIBRARY_DIRNAME instead of hardcoding "lib"Davide Pesavento2019-06-251-1/+2
| | | | | | | | | | | | Change-Id: If98125a9c8f95d3270ced4b8d0d11d1e7ca91060 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Respect QMAKE_LFLAGS set by the userDavide Pesavento2019-06-251-1/+1
| | | | | | | | | | Change-Id: If0b411c734ddbb357843d6513a36a70d5c09a6fb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Travis: simplify qt.conf on macOSIvan Komissarov2019-07-041-1/+1
| | | | | | | | | | | | | | | | It is possible to use relative path for the qmake's installation prefix Change-Id: Ic66d7d336bc9998589f3bbee3512dc552ba7d0ad Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Detect IAREW compiler version if it is found in a pathDenis Shienkov2019-07-033-4/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously we have only the IAR toolchain version detection from the Windows registry. This patch adds a compiler version detection in case the compiler path specified in a PATH environment variable. Change-Id: I61578723e15f109542aba1e231753aec611439eb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Insert the version into auto-detected SDCC profileDenis Shienkov2019-07-032-21/+25
| | | | | | | | | | | | | | | | | | This is useful in case we have installed a multiple toolchain versions. Change-Id: I4a2030589c21394da1b951eeeee99cbb5e1116a3 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Insert the version into auto-detected KEIL profileDenis Shienkov2019-07-032-21/+25
| | | | | | | | | | | | | | | | | | This is useful in case we have installed a multiple toolchain versions. Change-Id: I842cc5c5d281427385306e9d4aaaee7736a8a227 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Insert the version into auto-detected IAREW profileDenis Shienkov2019-07-025-27/+45
| | | | | | | | | | | | | | | | | | This is useful in case we have installed a multiple toolchain versions. Change-Id: Ia6d5fa1be16199d5e5f1eea8a077fcb885ba42e6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add macOS in Travis build configRichard Weickelt2019-07-012-5/+44
| | | | | | | | | | | | | | | | | | | | | | This patch enables Qbs builds and autotests on macOS X. Address sanitizer has to be disabled because it slows autotests down too much. Change-Id: Id8b5ec4284881c8c7a4ac3ef612e979f10f67e1b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix typo in build-qbs-with-qbs.shIvan Komissarov2019-06-271-2/+2
| | | | | | | | | | | | | | Change-Id: Ida8b02f3967c24422da61bb5f07ffde6407e9f33 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | scripts: Fix QBS_AUTOTEST_SETTINGS_DIR usageIvan Komissarov2019-06-241-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | For now, it not possible to pass an existing profile using the QBS_AUTOTEST_PROFILE (as was intended) since tests will try to find it in /tmp/qbs-settings, not in the default settings directory. Fix that by moving default value under the if clause. Change-Id: I9706e862bad77bd5d074fdef4edc0255b5a1d3f0 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | scripts: add possibility to customize some featuresIvan Komissarov2019-06-241-2/+10
|/ | | | | | | | | | | | On Travis macOS VM, sanitizer works extremely slow, which leads to timeouts while trying to run tests. Also, qdoc is missing from the HomeBrew's Qt. Change-Id: Idc9cec58531eeca7b5cd46f21ba4afed21e76620 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Fix build with NDKr20BogDan Vatra2019-06-171-1/+1
| | | | | | | | In NDK r20 clang adds -lc++ library automatically which leads to link fails. Change-Id: Ifa5ae1f4be7d8a93146ef08a5dc312596dd19147 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge "Merge 1.13 into master"The Qt Project2019-06-173-3/+5
|\
| * Merge 1.13 into masterChristian Kandeler2019-06-143-3/+5
| |\ | | | | | | | | | Change-Id: Idab53d6bd9b6f2841e30d4a31f53ac53a05c2f09