summaryrefslogtreecommitdiff
path: root/qbs/modules/qtc/qtc.qbs
Commit message (Collapse)AuthorAgeFilesLines
* Bump version -> 4.12.0Eike Ziller2020-04-081-5/+5
| | | | | Change-Id: I6894b5b095393981d9d42569ad43024e40711f94 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump versionEike Ziller2020-03-191-3/+3
| | | | | Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.12 beta2Eike Ziller2020-03-061-3/+3
| | | | | Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qbs: Fix QC version brandingChristian Stenger2020-02-131-1/+1
| | | | | Change-Id: Idb15a97db6637c0218053c3754e09716a52a2f96 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-02-071-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
| * Bump version to 4.11.2 and copyright year to 2020Eike Ziller2020-02-061-3/+3
| | | | | | | | | | Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bump to 4.11.1Eike Ziller2019-12-161-2/+2
| | | | | | | | | | Change-Id: I31c53f92acd02c380e44ecea534b178a3fb5458c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 4.11.0Eike Ziller2019-11-291-5/+5
| | | | | | | | | | Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | qbs build: Add litehtml supportChristian Kandeler2019-12-191-0/+2
| | | | | | | | | | Change-Id: Ia78ab35a5e844d5b2a1ee18752445c887228981f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Update version to 4.12 betaEike Ziller2019-12-061-5/+5
|/ | | | | Change-Id: I13641e62b01b126493be852e5db3ef76044918f7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* macOS: Fix execution of helper executables with UIEike Ziller2019-11-051-1/+1
| | | | | | | | | | | | | | The qt.conf that is written into the Resources/ folder is used for the main Qt Creator executable, so that cannot be used for the helper executables. Move the executables one more level down and add a separate qt.conf for them. Fixes: QTCREATORBUG-23120 Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Bump version -> 4.11.0-rc1Eike Ziller2019-11-041-3/+3
| | | | | Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.11 beta2Eike Ziller2019-10-211-3/+3
| | | | | Change-Id: Iea7b87cc19309eb4c3a921fa29d1b40170aaacc8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-06-211-3/+3
|\ | | | | | | Change-Id: I452d5cbf27c1a0d43a890cef74cb8f0b9646bf60
| * Bump versionEike Ziller2019-06-201-3/+3
|/ | | | | Change-Id: I5d2298e71837e3c146196f75a9bd1472771f1949 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-02-081-1/+1
|\ | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I278bc79cb64705471b360d0b8d06a8db17db7904
| * Merge remote-tracking branch 'origin/4.8' into 4.9Eike Ziller2019-02-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
| | * Bump copyright yearEike Ziller2019-02-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I532c92311fda448fc272ab31e26ad562d9fb3ce5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Bump version to 4.8.2Eike Ziller2019-01-171-2/+2
| | | | | | | | | | | | | | | Change-Id: I99f7baaab46a157f37e72619b71e968b37c330f4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Bump version to 4.8.1Eike Ziller2018-12-101-2/+2
| | | | | | | | | | | | | | | Change-Id: Ic5447ccb1e0a5e9b181d4210b2c84b526681c6da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Bump versionEike Ziller2019-02-071-3/+3
|/ / | | | | | | | | Change-Id: I90fac436cdab41739633c383445003a3c8f9feae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SSH: Use OpenSSH toolsChristian Kandeler2018-12-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of our own SSH library. Advantages: - Full compatibility with OpenSSH behavior guaranteed. - Minimal maintenance effort. - Less code to build. - Big chunk of 3rd party sources can be removed from our repository. One the downside, Windows users now need to install OpenSSH for RemoteLinux support. Hoewever, people doing embedded development probably have it installed anyway. [ChangeLog] Switched SSH backend to OpenSSH Fixes: QTCREATORBUG-15744 Fixes: QTCREATORBUG-15807 Fixes: QTCREATORBUG-19306 Fixes: QTCREATORBUG-20210 Change-Id: Ifcfefdd39401e45ba1f4aca35d2c5bf7046c7aab Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Version for master is 4.9.0-beta1Eike Ziller2018-11-291-3/+3
|/ | | | | Change-Id: I2c3ca4910147445c4493828df5c6252f30379dc9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.8.0Eike Ziller2018-11-261-5/+5
| | | | | Change-Id: I593dc1905bd4e2240449fb9f393c2c14b73488f1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bump to 4.8 RC1Eike Ziller2018-11-191-3/+3
| | | | | Change-Id: I67dbd98002f270bc053f3680adcf51034cde4593 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Increase QT_DISABLE_DEPRECATED_BEFORE to 5.9Orgad Shaneh2018-11-121-1/+1
| | | | | Change-Id: I16b1fe72a9f9b87a8e7676a1591a5254d4005fad Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.8 beta2Eike Ziller2018-10-121-3/+3
| | | | | Change-Id: Ie8034adcc95a188d5a78a71b303fc073ea1d6a3c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-08-151-0/+1
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/clangtools/clangtoolruncontrol.cpp src/plugins/cpptools/compileroptionsbuilder.cpp Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
| * SSH: Use Botan2Christian Kandeler2018-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Botan 1.10 will be completely unsupported by the end of this year, so we now target API version 2 instead. Also upgrade our bundled Botan to the latest version 2.7. We no longer check in pre-processed files, but use the upstream sources directly (with unneeded parts removed), employing Botan's own configure script for building. This will make future upgrades much simpler. A script to automate this process is also provided. Task-number: QTCREATORBUG-18802 Task-number: QTCREATORBUG-8107 Change-Id: I5a5ea62cfd30d720b556217142e8b7e06bf49f7e Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bump to 4.7.1Eike Ziller2018-07-181-2/+2
| | | | | | | | | | Change-Id: I428ed0c2643193caec1e6a0f47eff8f55df55ef2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bump to 4.7.0Eike Ziller2018-07-061-5/+5
| | | | | | | | | | Change-Id: I339097aa2a0deeeea4bd81a9a8b74c6732bb217d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump to 4.7-rc1Eike Ziller2018-06-261-3/+3
| | | | | | | | | | Change-Id: I071ef81b3285102eeedba7d475aabfda762926d3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Rename to 4.7.0-beta2Eike Ziller2018-06-141-1/+1
| | | | | | | | | | | | Change-Id: I6f5a5eb2dc9f12691e14ff4dac3da5aa732d96ab Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| * Bump version to 4.7.0-rc1Eike Ziller2018-06-061-3/+3
| | | | | | | | | | Change-Id: I8be1dbdc726ec2b5520dbceb19973337afb71583 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Version bump for 4.8 betaEike Ziller2018-05-161-3/+3
|/ | | | | Change-Id: Ib61d6d6d6f2433299fe7867576a7c7d8558011ac Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-231-0/+1
|\ | | | | | | Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
| * qbs build: Suppress some warningsChristian Kandeler2018-01-191-0/+1
| | | | | | | | | | | | | | Like in the qmake build. Change-Id: I7dc4a42bf3e4394a4fb6a579646d806f80fa3e96 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I7dcd8e067b7597144eb3b27d917cb7fe0279aad4
| * Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-01-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: I52986bd2557490431bae48f9db86c848a95592d2
| | * Bump displayed copyright yearEike Ziller2018-01-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I5cb95e9b4736279b547208f303a5453f5a4f9dc5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Version bump to 4.5.1Eike Ziller2017-12-121-2/+2
| | | | | | | | | | | | | | | Change-Id: Ifb5656f33cdb4370c1c654c8d98587071528a72f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Bump versionEike Ziller2017-11-241-5/+5
| | | | | | | | | | | | | | | Change-Id: Ie823825b9dd4092f9997716790bfc3fbe138dd46 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Bump versionEike Ziller2018-01-171-3/+3
|/ / | | | | | | | | Change-Id: I7ab954a3d696203a392e618933e8f075466af61a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Make executable name configurableEike Ziller2018-01-161-1/+2
| | | | | | | | | | Change-Id: I6b5420ab2275c37e51f665005e31b80b6dfae8cb Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Qbs build: Fix that copyright was not adapted in Info.plistEike Ziller2018-01-161-0/+1
| | | | | | | | | | Change-Id: Ie5670a4a420f34dbef6cbb204063e8921eafd82b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Make IDE name and ids configurable at build timeEike Ziller2018-01-101-0/+4
| | | | | | | | | | | | | | Make it unnecessary to hack app_version.h.in for that. Change-Id: Ibc3bf332916ab9f293b6782d3b5a40078dbd7bcb Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-191-0/+2
|\ \ | |/ | | | | Change-Id: Ie83666bd18e899dabf5190c360027bf02abecdaf
| * qbs build: Add missing definesChristian Kandeler2017-10-181-0/+2
| | | | | | | | | | | | | | | | The string concatenation macros were not set, as opposed to the qmake build. Change-Id: I32e2c72c891419ef8352cb7b46e3b7f9b82b6312 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Version bump to 4.5-rc1Eike Ziller2017-10-131-3/+3
| | | | | | | | | | Change-Id: I5d7d3ec295feb60ad0d944b4f68344c1857146ad Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Version bump for masterEike Ziller2017-09-271-3/+3
|/ | | | | Change-Id: I0d2a37c4dd7435e55534538b7b2c4d9d69640e14 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
View Lorry Controller Status