summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Properly handle non-string exceptions2.0Christian Kandeler2023-05-174-3/+72
| | | | | | Fixes: QBS-1734 Change-Id: If7901dc698fdd5ee44021a3b92cf28295123eccc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* msvc: check for clang-cl firstIvan Komissarov2023-05-151-12/+11
| | | | | | | | | Current LLVM version is 16, so relatively soon the checks if (msvc) compiler version >= 18 will start to pass with clang-cl toolchain. Change-Id: Id0e2e458195371fab1c1d358f35f2cae94fbc74b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Clean paths from prl fileLeon Buckel2023-05-121-1/+1
| | | | | | Task-number: QBS-1732 Change-Id: I4544d6203b9647b85fff4cc319f2ea5809749a59 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* js_versionCompare: allow build numberIvan Komissarov2023-05-123-3/+5
| | | | | | | | It is not clear why it worked before. Task-number: QBS-1733 Change-Id: Ib870f669d9151c91635b7078fae8cb217c9955f3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* fix changelogsIvan Komissarov2023-05-113-16/+16
| | | | | | | | | | Choco complains about e-mails in nuspec which contains all release notes. Remove e-mails from old changelogs. Also, fix the name of the file for 1.24.0 release. Change-Id: I9e0e305283c224f7fc5c3a76456efe474b7ccd4c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: fix qt5 buildv2.0.1Ivan Komissarov2023-05-081-0/+1
| | | | | | | | | | Without the DocTools package, Qt5::qdoc target is not available. This amends e7763d972a4404b283260d29ebf7720a981349cb. Change-Id: I10a9a32686e816e65bdfdcc7a70c34d89f71c448 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: Update focal imagesIvan Komissarov2023-05-062-5/+13
| | | | | Change-Id: Ide8cb42abc270bb691b2f4caff6412531cbaf50a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update changelogIvan Komissarov2023-05-061-0/+14
| | | | | Change-Id: Ie0f066ae6caddf2643f5b1696eab37fe2d5088e7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: Update Qt on Windows to 6.5Ivan Komissarov2023-05-052-6/+7
| | | | | Change-Id: I47c9e736e3a453660379c14276922103c3bf5daf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: bump Qt versions on mac to 6.5.0Ivan Komissarov2023-05-031-7/+14
| | | | | | | | ... and on iOS to 6.3.2 since newer versions are not supported yet. Change-Id: I7f021bedc59d7ae25793830db1e27f5f4a6f0a24 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt: Fix compiled-qml on iOS and Qt6Ivan Komissarov2023-05-032-11/+21
| | | | | | Task-number: QBS-1732 Change-Id: Id5e6a3aa65ea276093d25d8b939dd59bbe090eda Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* install-qt.sh: Support Qt6 iOSIvan Komissarov2023-05-021-0/+7
| | | | | Change-Id: I32bfea051b52e96a60bc4410dd89a72fd7bb286e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt support: workaround for broken iOS prfsIvan Komissarov2023-05-021-0/+2
| | | | | Change-Id: Ib0dcd880d963d25c0a8a20bb8bccfd85bcb3f510 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* apple: fix detecting xcode via xcode-selectIvan Komissarov2023-05-021-1/+1
| | | | | | | | | | | It appears, that xcode-select --print-path adds extra \n at the end of output. This also fixes the macOS 13.4.1 job since we set the target xcode as a default one via xcode-select. Change-Id: I6e2219c6b76682755f949ece63f43df33cf15481 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: bump Xcode version to 14.2Ivan Komissarov2023-05-021-10/+10
| | | | | Change-Id: Ia650a42f6b88fd8eceb1bf24663baeee17835e35 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ScriptEngine: Make import functionality exception safeChristian Kandeler2023-04-288-29/+69
| | | | | | Fixes: QBS-1730 Change-Id: I83324b7d859412580213dc4eb9f1f60e0f9063f2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Update changelogIvan Komissarov2023-04-221-2/+6
| | | | | Change-Id: Ib0ff20ea53c0ba3620338f7615ccd92f3e5fa82d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix compiler warningChristian Kandeler2023-04-171-0/+1
| | | | | Change-Id: I16c1373e21db71a47be45bfebaeca91084e1b067 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix build with Qt6.5Björn Schäpers2023-04-141-1/+1
| | | | | | | | | | QDomDocument::setContent received new overloads which do not return a bool, but a QDomDocument::ParseResult, which can be converted to bool. Thus the static_cast is enough and shouldn't bother builds with Qt < 6.5. Change-Id: I2ef334503b853adc6fe54fd739321b22a4ba6721 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* mingw: workaround for cpp.minimumWindowsVersionIvan Komissarov2023-04-113-3/+6
| | | | | | | | | | | | It seems that mingw is broken and produces invalid binaries when using cpp.minimumWindowsVersion >= 6.3. Also, update minimumSystemVersion test to use 6.2 aka Windows 8. Task-number: QBS-1724 Change-Id: Icea9b21ce6c3b7709495a28114a8c933a88b4647 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* apple: fix embeddedProfileNameIvan Komissarov2023-04-111-1/+1
| | | | | | | Task-number: QBS-1722 Change-Id: Ia6bc6dc4397a613956f27f70ba522c89f7fdbc3e Reviewed-by: Leon Buckel <leon.buckel@clausmark.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* jsengine: do not allow QByteArray as a type for js variantIvan Komissarov2023-04-101-0/+2
| | | | | Change-Id: Ibdc2e764a5db8c4ab8b0afe9aa24c476f1dea1be Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* apple: fix validAfter/validBefore datetimesIvan Komissarov2023-04-091-2/+2
| | | | | | | Should be the other way around. Change-Id: I4658cd197be51dedd4dcc8eac8ed9c9b86bc8544 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* apple: fix sha1 typeIvan Komissarov2023-04-091-2/+2
| | | | | | Fixes: QBS-1722 Change-Id: Ib4d08aaf325a0a0e803b9adaa949a026ad4413ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Only setup Qt in qbspkgconfig when not cross compilingKai Dohmen2023-04-092-1/+5
| | | | | | | | | | When cross compiling the qmake binary pointed to by the pkg-config-file might contain the wrong qmake. For simplicity just deactivate setting up Qt when cross compiling. Fixes: QBS-1717 Change-Id: I1f856b1f8f918ea09b3280c2f672d0f7db2b8f5f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Update changelogChristian Kandeler2023-04-061-0/+3
| | | | | Change-Id: I9c758dcc77aac7cd9e47e75a8c99d41b6f82afaa Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* xcode: add support for xcode 14.3Ivan Komissarov2023-04-063-6/+18
| | | | | Change-Id: Id28155e06744e53f99fdbcdc9f5bf5231a3f511e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbs build: Fix qbsbuildconfig moduleChristian Kandeler2023-04-041-1/+1
| | | | | | | | This module does not have an explicit dependency on the Qt module, so there should be no "Qt" identifier in scope. Change-Id: Iafa7e95bdf53e873bb37c9408a1ed93e0b42dc20 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Bump versionChristian Kandeler2023-04-041-1/+1
| | | | | Change-Id: I7c952ea53b009e0ce29c6e4824b5238f9ba70a41 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* grpc: Bump C++ language version in the autotest againv2.0.0Christian Kandeler2023-03-171-1/+1
| | | | | | | The generated code makes use of it these days. Change-Id: I90460a15630cfb55f274da3484d59bf6f1a2e4ec Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* grpc: Fix macOS CI againChristian Kandeler2023-03-171-1/+1
| | | | | Change-Id: I224ace97588400f540f155eed68495345f1d55a9 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Remove UBSAN suppressions fileChristian Kandeler2023-03-172-4/+0
| | | | | | | It's not relevant anymore without QtScript. Change-Id: Iafb56f71764f8334a1e983cdb83014ac847deed3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* freedesktop: Rename "name" property to "appName"Christian Kandeler2023-03-154-3/+7
| | | | | | | | | "name" is a built-in property of the Module item that must not be set by users. Astonishingly, this has worked so far due to the way the ModuleLoader code was written. Change-Id: I959bc0bba6b7c17a420fc6201031ab0bf4449292 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Tests: Upgrade the grpc test app to C++14Christian Kandeler2023-03-071-1/+1
| | | | | | | As requested by our macOS CI machines. Change-Id: Ic5ef011585bf89da1f04162a26682308b9291c38 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: Find qdoc directly instead of relying on qmake pathDmitry Shachnev2023-03-061-19/+3
| | | | | | | | | | | | Qt6ToolsToolsTargets.cmake provides a Qt6::qdoc target, so there is no need to guess qdoc path based on qmake path. It is the same file where Qt6::qhelpgenerator is defined, which we use here too. This fixes build on Debian where we moved Qt6::qmake into a different path to help with cross-building, leaving Qt6::qdoc where it was. Change-Id: I9e66ffafc8aeb18edc1fe2b27608caa4ee90c3f7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Qt/Android: Adapt to 6.4 androiddeployqtChristian Kandeler2023-03-062-3/+8
| | | | | | | Task-number: QTBUG-111558 Change-Id: I728c69635b3946db8a9019fa2fecf076d72d8468 Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Prevent dangling JS valuesChristian Kandeler2023-03-066-21/+31
| | | | | | | | | | | As opposed to QtScript, such values cannot be re-used in QuickJS. This was overlooked in 087c22e17721f37490dd2048a567b6a58065d939. I assume this is the culprit for seemingly random crashes and "not a function" messages we have been seeing sometimes when building with Qt Creator. Change-Id: Ia4e7aed0cda97439ac75db5ecfbf08ff096a02b2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* CMake: Enable exception handling on MSVCOrgad Shaneh2023-02-231-0/+3
| | | | | | | | | | | | Sample warning: Building CXX object src\shared\qbs\src\shared\json\CMakeFiles\qbsjson.dir\json.cpp.obj C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.34.31933\include\ostream(378): warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.34.31933\include\ostream(371): note: while compiling class template member function 'std::basic_ostream<char,std::char_traits<char>> &std::basic_ostream<char,std::char_traits<char>>::operator <<(unsigned __int64)' F:\Projects\qt-creator\qt-creator\src\shared\qbs\src\shared\json\json.cpp(4142): note: see reference to function template instantiation 'std::basic_ostream<char,std::char_traits<char>> &std::basic_ostream<char,std::char_traits<char>>::operator <<(unsigned __int64)' being compiled C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.34.31933\include\ostream(671): note: see reference to class template instantiation 'std::basic_ostream<char,std::char_traits<char>>' being compiled Change-Id: I404cdeb5e447fe880998aaec4c576c0ed6dd3507 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* docker: update Windows imageIvan Komissarov2023-02-214-23/+15
| | | | | | | | | | | | - install latest vs2019 compiler - install latest win10 SDK - add vswhere to simplify searching VS - update Qt to 6.2.4 - update Qbs to 1.24.0 - drop support for 32-bit packages in choco Change-Id: I0a57baf160307b84e62fea5c56687efcce7fe42c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Docs: Do not use .contains()Christian Kandeler2023-02-207-37/+37
| | | | | | | Amends e3522f42773cfbb9a980e859c906457b3571fa1f. Change-Id: If51576f080ee5c01eeae493934cf646403594965 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Prefer built-in JS function in modulesChristian Kandeler2023-02-2066-341/+341
| | | | | | | contains -> includes Change-Id: Id893c2ea0659d9bded4f5cec1a3160ccd802118b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Protobuf: Let users provide extra grpc libs for linkingChristian Kandeler2023-02-163-1/+12
| | | | | | | ... and make use of that in the CI. Change-Id: I7e246e265a311ba24ebd6cde808445039d4c3e93 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Remove documentation for outdated JS extensions to Array and StringChristian Kandeler2023-02-161-24/+0
| | | | | | | | | | | String.{starts,ends}With() are part of ECMAScript 6 and supported directly by QuickJS. {String,Array}.contains() are superseded by ECMAScript's includes(). Deprecating them would needlessly annoy users, but we shouldn't encourage their use either. Change-Id: Ie0828ba0f78b0235e4b0a3127e56dc8fc2cc46dd Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Prefer built-in JS function in autotestsChristian Kandeler2023-02-16131-282/+282
| | | | | | | contains -> includes Change-Id: I330b1ee3319399d6c59ce5a4efaf14c642ad361e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* GitHub actions: update macos release jobIvan Komissarov2023-02-151-4/+2
| | | | | Change-Id: Ie3b62927baf9009666e4f69ef87a0205a1e512f2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Build Qbs with Qt 6 by defaultIvan Komissarov2023-02-153-27/+22
| | | | | Change-Id: I78ca74c27ccea64331a0995a0e611b8c79411fcb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt support: correctly set minimum windows version for Qt6Ivan Komissarov2023-02-141-1/+1
| | | | | | | | According to the doc, Win 7 was dropped in 6.0 https://doc.qt.io/archives/qt-6.0/supported-platforms.html Change-Id: I34f7501b7348bb658998b713b1ee08e53e91cb95 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* install-qt.sh: fix mingw install dirIvan Komissarov2023-02-141-2/+6
| | | | | | | | The installation directory for mingw 9.0 was detected incorrectly which lead to the fact we used the wrong compiler in CI. Change-Id: I4635dde0cf68eacc8436e6393609162e15add418 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove dangling link to unused hostOS propertyRichard Weickelt2023-02-141-2/+0
| | | | | | | | | | The hostOS property was taken out of the qbs module and replaced by the os property of the Host service. The whole bullet point is no longer valid. Change-Id: Ia35a51dffc7b7593e896b754f741cf12aab71db3 Fixes: QBS-1716 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* PropertyList: Do not return undefined from toObject()Christian Kandeler2023-02-101-1/+3
| | | | | | Change-Id: Ie1981dd23ca5a4d35a9f63d84efce30c5eed01f4 Reviewed-by: Maximilian Hrabowski <maximilian.hrabowski@bee360.com> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
View Lorry Controller Status