aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 4.9.2Eike Ziller2019-05-281-2/+2
| | | | | Change-Id: I29e0f3c2e5f4569b2a23961b6980740501915cb3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.9.1Eike Ziller2019-04-291-2/+2
| | | | | Change-Id: Icccb40f920ff90980b83cb82e6d0598281efb6d2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bump to 4.9.0Eike Ziller2019-03-281-5/+5
| | | | | Change-Id: I7d6b5c7b000420230273ceb983310a8bbb4ca77d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.9 rcEike Ziller2019-03-121-3/+3
| | | | | Change-Id: Ic17ad9281013fd061c3f23c423a69108e8193385 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.9.0-beta2Eike Ziller2019-03-011-3/+3
| | | | | Change-Id: I7ba0b4651f5a718c09ecf72fdc25b26cceaaf966 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix build of command-line qbs with qbsChristian Kandeler2019-02-251-1/+1
| | | | | | | | | | The plugin path we pass as a define to the qbs sources contained the "/ qbs/plugins" suffix which qbs already adds itself. Therefore, the command-line qbs was not functional. Change-Id: I2bfb967f998e69bbe4da760a1f517e1f40e4f055 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Clang: Build clangformat only if clang/Format/Format.h existsNikolai Kosjar2019-02-211-0/+4
| | | | | | | ...in the LLVM_INSTALL_DIR. Change-Id: I974f32759bca7fb467524bf61ff7967098748f0e Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* 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>
* | Merge remote-tracking branch 'origin/4.8' into 4.9Eike Ziller2019-02-041-1/+8
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/android/androidrunnerworker.cpp src/plugins/android/androidrunnerworker.h Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
| * qbs build: Fix regression with qbs 1.13Christian Kandeler2019-02-041-1/+8
| | | | | | | | | | | | | | | | Don't fall back to pkg-config for non-existing dev headers products, as that becomes expensive. Change-Id: Ibf51a93950e04ee061ca16444fbc18349389d74a Reviewed-by: Christian Stenger <christian.stenger@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>
* | Clang: Fix detection of clang with qbsNikolai Kosjar2019-01-031-1/+1
| | | | | | | | | | | | | | | | | | "res" was undefined. Amends 2379007c177fa97c6eb02d9c87fd9d728eaa6e98. Change-Id: I3af0e94c70fcb6b5b1b8027383e767a5d9cd8238 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Clang: Suppress GCC warning with LLVM 7.0.1Orgad Shaneh2018-12-191-0/+3
| | | | | | | | | | | | Change-Id: I6de160b42472560a3b33d9a3390b0890eabe9d44 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Marco Bubke <marco.bubke@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>
* Clang: Strip some more warningsv4.8.0-rc1Orgad Shaneh2018-11-221-0/+3
| | | | | | | Appear in pchtaskgenerator-test.cpp and builddependenciesprovider-test.cpp. Change-Id: I4f9f2660655e0dfc1002980ae31bc09288110b2d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Version bump to 4.8 RC1Eike Ziller2018-11-191-3/+3
| | | | | Change-Id: I67dbd98002f270bc053f3680adcf51034cde4593 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Remove some warning flags provided by LLVMOrgad Shaneh2018-11-151-4/+14
| | | | | | | | Clang unit tests produce many warnings with GCC8 and these flags (-Wnon-virtual-dtor, -Woverloaded-virtual). Change-Id: I54a4c9c5b2f12da3c3898fc6f3beca0d4dfe478c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Clang: Default to llvm-config-7Orgad Shaneh2018-11-151-1/+1
| | | | | Change-Id: Id29095f378268b55430e715ec7d37f5a52159df5 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Documentation: Fix qbs buildChristian Kandeler2018-11-141-0/+4
| | | | | | | Amends 1e1c212090 and 54208113ee. Change-Id: I1f15a118b40513382e4e1d5767781865d4458ce9 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>
* ClangFormat: Fix constructing libs for qbsNikolai Kosjar2018-10-161-7/+7
| | | | | | | Assignment after concat() was missing. Change-Id: I9a038cae6372648561a5450e9e3417c4c603ab7e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Bump version to 4.8 beta2Eike Ziller2018-10-121-3/+3
| | | | | Change-Id: Ie8034adcc95a188d5a78a71b303fc073ea1d6a3c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Fix ClangFormat build with clang-7Ivan Donchevskii2018-10-052-10/+26
| | | | | Change-Id: I0859b7aad1a49f8d46ee4b32cc32039cfa0b482b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix qbs build of clangformat pluginAlexandru Croitor2018-09-252-7/+30
| | | | | Change-Id: Ic23a34048c62ed39590ad422ea3e4f8fea9fc5a1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix references to the clang code model documentation fileChristian Kandeler2018-08-201-1/+2
| | | | | | | Was forgotten in 7ab07a4e8f. Change-Id: I2c6d21b79658e3946eb6ecdcf7b11992c0bf865e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>
* | Fix qbs build when no llvm is presentChristian Kandeler2018-08-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | Some defines were set conditionally, but accessed unconditionally, which of course breaks the build. Make sure the defines are always set. Also gather them in a module, instead of copying the code all over the place. Change-Id: Iac628da64fb3934872d912510936aeccd0e20247 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Clang: only build with LibTooling if explicitly enabledUlf Hermann2018-06-271-3/+1
| | | | | | | | | | | | | | The feature is experimental and should not be used, yet. Change-Id: Ifb9a651dcbaade5801ac28f900030407f12dc844 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-05-222-4/+4
|\| | | | | | | Change-Id: I00dd929a4ed32af8f1b76cea57a7c49239dafc7c
| * Clang: Require LLVM/Clang >= 6.0.0Nikolai Kosjar2018-05-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt versions and tests, remove code assuming clang < 6.0. Switch also to our custom repositories instead of dealing with patch files. LLVM/Clang 6 was released on 09 Mar 2018. Task-number: QTCREATORBUG-18535 Task-number: QTCREATORBUG-18552 Change-Id: I0ec2c2f56265e161ae7cbb5b03e7b8a182ba6cc6 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Version bump for 4.8 betaEike Ziller2018-05-161-3/+3
|/ | | | | Change-Id: Ib61d6d6d6f2433299fe7867576a7c7d8558011ac Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ClangTools: Remove clang executable settingsIvan Donchevskii2018-05-042-0/+8
| | | | | | | | We use custom clang executable and it does not make sense anymore to give a choice of changing it. Change-Id: Icf86042ac3fcd08c320ef2bbdaabef1102b023b5 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-133-2/+5
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/settingsaccessor.cpp src/plugins/autotest/autotestplugin.cpp src/plugins/git/gitclient.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.h Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
| * qbs build: Enable the vcs module only for commercial pluginsChristian Kandeler2018-04-043-2/+5
| | | | | | | | | | | | | | | | | | The other ones are in the Qt Creator source tree and should not get rebuilt on repo metadata changes, because they do not make use of QTC_PLUGIN_REVISION. Change-Id: I216a89de4411948b7ccad65f883d0d8782a283d4 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| * Version bump to 4.6.1Eike Ziller2018-03-281-2/+2
| | | | | | | | | | Change-Id: I814d2b864dff341977a41c4d03d96de465a72775 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Increase requirement for building Qt Creator from Qt 5.6.2 to Qt 5.9Eike Ziller2018-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.11 will be released and Qt 5.9 is the new LTS. Increasing the requirement allows us to remove some baggage and workarounds like Utils::asConst, special Q_OVERRIDE header, and deployment target adaptions on macOS, and simplifies pulling in proparser changes from Qt. Change-Id: I9faf99336d26dd20bd63e6904ae543c0f351aa4d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-191-3/+1
|\| | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
| * Synchronize autotest defines in qmake and qbs buildJoerg Bornemann2018-03-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | Do not remove QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION in QtcAutotest, but in the two tests that won't build with it. In the qmake build the defines are not removed from json.pro, because this file does not include qttest.pri. Change-Id: I97d173528ca2a02bac1bfae30709a959e6b69375 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Version bump to 4.6.0Eike Ziller2018-03-161-5/+5
| | | | | | | | | | Change-Id: Ibf3dd86a654080cb9b5ab2a4fd790f8f59879787 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-131-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeproject.h src/plugins/debugger/debuggerplugin.cpp src/plugins/ios/iosrunfactories.cpp src/plugins/nim/project/nimproject.h src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp src/plugins/qmlprojectmanager/qmlproject.h src/plugins/qnx/qnxrunconfigurationfactory.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/winrt/winrtrunfactories.cpp Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 06:54:53 +0000