aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add change log for 1.14.1v1.14.11.14Christian Kandeler2019-10-161-0/+4
| | | | | Change-Id: Ide01ad4e9abb3e0e1c1ffe3fe10bf14368cb32b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qt support: Do not put all the QML plugin list content on one lineChristian Kandeler2019-10-141-1/+1
| | | | | | | | | Add a newline after each PRL file entry. Otherwise, a line can get longer than 16K characters, which breaks the MSVC linker. Fixes: QBS-1465 Change-Id: Idb1e39aee8c3ae3ad6ea844723253e7d228bd7de Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qt support: Fix reading plugin prl filesChristian Kandeler2019-10-141-1/+1
| | | | | | | Amends 8c290c624d. Change-Id: I9b08b921a46ac56239dd7934f8c3aa9addf70d52 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Version bumpChristian Kandeler2019-10-081-1/+1
| | | | | Change-Id: Ibfe460f99c2dae3ccf64169389dd7ddfb11be5ac Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Darwin: Adapt to Xcode 11Christian Kandeler2019-10-043-19/+21
| | | | | | | | | | | | | | - xcspec files can now refer to variables in variable names, as in the following line: CONTENTS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH_SHALLOW_BUNDLE_$ (SHALLOW_BUNDLE)) - Some new environment variables have been introduced and need to be set when running our probes; e.g. "SWIFT_PLATFORM_TARGET_PREFIX". - The symbolLinkMode autotest made an invalid assumption about order of output. Change-Id: Ic845c2c4a8eafb4ece0f0bb04e6e492681a02979 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* baremetal: Add missed output artifacts for SDCC compilerDenis Shienkov2019-10-012-61/+92
| | | | | | | | | | Compiler produces a lot of additional ".adb", ".lst", ".asm", ".sym", ".rst", ".lk", ".mem" files. This files should be also processed in SDCC module (e.g. it allows to remove this files by 'clean' command). Change-Id: Ib07dbe63ab27e263d67025ce5cd40a967910d354 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix missed linker artifact for C51 compilerDenis Shienkov2019-09-302-55/+50
| | | | | | | | | | | We need to add a file with extension '.m51' which is a map file, generated by BL51 linker for 8051 architecture. Also the artifacts creation code is refactored and improved a bit. Change-Id: I49b487acf87263dde818696d5a3478333839c30b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Handle missed 'driverLinkerFlags' property for SDCCDenis Shienkov2019-09-301-1/+3
| | | | | Change-Id: Ibd58a4bdf6c05af79c0d847ccaacaec5381b35d5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix assembler command for SDCC compilerv1.14.0Denis Shienkov2019-09-271-2/+4
| | | | | | | | | | | | | | We need to use the assembler command in the followiong format: Usage: [-Options] outfile file1 [file2 file3 ...] Besides, we have added an additional assembler option '-l' to explicitly generate of a listing file; without of this option the linking fails. Change-Id: I0240b354f44edac94e3e4305fe6b1a4c34ca4bf9 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Darwin: More filtering in SDK directoryChristian Kandeler2019-09-261-0/+3
| | | | | | | | Do not try to detect an SDK from a driver kit directory. Fixes: QBS-1495 Change-Id: I05ef565d599e83dcc02d0d18e656fabfd0aad943 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* baremetal: Fix auto detection of SDCC toolchain on WindowsDenis Shienkov2019-09-232-18/+49
| | | | | | | | | | | | The SDCC toolchain package can be provided as 32-bit or as 64-bit installer. If the SDCC 64-bit package will be installed on the 32-bit Windows, then it will not be found in the system registry, because we use the QSettings::NativeFormat. So, we need to check the data for the 32-bit and 64-bit registry sequentially. Change-Id: I15981f39274308e3690cf072396cf1ae82b6743d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add how-to about ccacheKai Koehne2019-09-162-1/+32
| | | | | | | Task-number: QBS-1325 Change-Id: Ice2e5f16b453b9bde8d2a90918eb593db81bff97 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Richard Weickelt <richard@weickelt.de>
* Fix MSVC warningsOrgad Shaneh2019-09-132-2/+2
| | | | | | | | 'return': conversion from 'size_t' to 'int' Change-Id: I18e8fa03a9303855693da3027b722b104cee5d6d Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: hjk <hjk@qt.io>
* Fix Qt module-provider for Qt5.13.1 and beyondRichard Weickelt2019-09-081-1/+1
| | | | | | Change-Id: I6eef8b28a741c417dc54a33577a2ad4b43def767 Fixes: QBS-1492 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Autotests: Work around compression bug in 5.13.0Christian Kandeler2019-08-301-1/+2
| | | | | | | Our QtScxml test ran into QTBUG-76521. Change-Id: Id667846acd165d5b79dd6acc9cb8c790f6e228a2 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Process Command: Do not needlessly interpret output as textChristian Kandeler2019-08-268-1/+53
| | | | | | | | | ... when redirecting process output. Only do that if there is an output filter function. Otherwise, we break redirection of binary data. Fixes: QBS-1488 Change-Id: Ic5a1d2653fa8fc9c4f0eb5d31b7315d7aba3e030 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Avoid uses of Java-style iteratorshjk2019-07-301-16/+4
| | | | | Change-Id: I90cece156033b5d223a86016401a2199f5b6c11e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Prepare for explicit QChar constructorshjk2019-07-291-1/+1
| | | | | Change-Id: I906f63236230f10e6bdfb16ef3ee25cee8c407f6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Improve clang-cl auto-detectionIvan Komissarov2019-07-251-1/+41
| | | | | | | | | Now also check for the clang-cl in the default install locations Task-number: QBS-1316 Change-Id: I5d0dfd2b98164b0cac08358001cd1946b4f8aadc Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Fix detection of C++ language option for IARDenis Shienkov2019-07-241-2/+13
| | | | | | | | | | | | | | ... which is used at dumping of predefined macros and a header paths. Reason is that for the different architectures the IAR use different C++ language options: * for ARM: --c++ * for AVR or 8051: --ec++ Change-Id: Ic2b4d50e9e2a978a5cbc69ed5353d5953e83c85d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Work around deprecation warnings in Qthjk2019-07-245-6/+22
| | | | | Change-Id: Iff45f56fc91f3d513440a3e2aaf519a7aa0f7744 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Avoid some deprecation warnings for QLatin1Literal useshjk2019-07-221-8/+8
| | | | | Change-Id: I8fe64c2ab78b1cf2e1af2a6aa2dad201299a0a94 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix outdated documentation for some multiplexing propertiesChristian Kandeler2019-07-171-3/+2
| | | | | | | | Amends 38c897a0d4. Fixes: QBS-1458 Change-Id: I2b3d72f5d738cc45fa061ce47711160d54bdfdc5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Fix binutils pathChristian Kandeler2019-07-161-1/+1
| | | | | | | | Amends 65cb0d3e2d. Fixes: QBS-1459 Change-Id: I771cc179bcc996559d76c85d785780a1b044812b Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Set minimumTvosVersion to "6.0" by defaultIvan Komissarov2019-07-152-2/+5
| | | | | | | | | | | | | | This fixes (at least) two compile errors: - clang: error: invalid deployment target for -stdlib=libc++ (requires iOS 5.0 or later) - ld: library not found for -ldylib1.o The dylib1 is only present on macOS and not present in recent tvOS/iOS SDKs, clang tries to link to it if deployment target is less or equal to "5.0". Change-Id: Ie77a514bb2661312823df054f0dfca07d69e3059 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add change log for 1.14.0Christian Kandeler2019-07-151-0/+35
| | | | | | | Change-Id: I1c57713abf60c2b5b6ee7bf6a0b403736b60307b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ios: Move cpp.entryPoint from Qt.Core to Qt.guiIvan Komissarov2019-07-102-4/+6
| | | | | | | | | It seems, that console ios apps should not try to do a _qt_main_wrapper trick since there's no platform plugin linked to the app and linker fails to find wrapper. Change-Id: I607db658d5e25d6029626b4a7efb46b2e228ab52 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* 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>
* 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>
* 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
| | * Add Visual Studio 2019 support1.13Joerg Bornemann2019-06-073-3/+5
| | | | | | | | | | | | | | | | | | Fixes: QBS-1451 Change-Id: I644835cf8ce18d546e6c8e2c75f689766456555d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| | * Version bumpChristian Kandeler2019-05-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I475736e1fb146858264cc1da99554630c3af30a9 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 16:17:05 +0000