aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* Version bump to 4.6.2Eike Ziller2018-05-041-2/+2
| | | | | Change-Id: I34702cbff029caa071f4e3556350011d84d26f2a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* 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>
* 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>
* qbs build: Suppress vcs header file creationChristian Kandeler2018-03-121-0/+1
| | | | | | | | The repository state is only used on the project file level at the moment. Change-Id: I8f6ff587785d4fbc5586836a31c256a2e114cdb6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-03-021-1/+29
|\ | | | | | | Change-Id: Iaf254ce5bc895c703aa6772b4aaa139e531696f6
| * Allow plugins to specify a "revision" to show in addition to the versionv4.5.2Eike Ziller2018-03-021-1/+29
| | | | | | | | | | | | | | | | | | | | | | To be used for the version control revision the plugin was built from. Invent a QTC_PLUGIN_REVISION replacement string for the plugin .json.in which can be set by the build process. Task-number: QTCREATORBUG-19951 Change-Id: Id5fd64b5506383e0b7749bcfd34d178baf8fe7af Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Bump versionEike Ziller2018-02-221-2/+2
| | | | | | | | | | Change-Id: I4ea26ca1bfeedc2b57c9ffcae855035c47189935 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | qbs build: Use project-global destination dir for libs and pluginsChristian Kandeler2018-02-122-2/+2
| | | | | | | | | | | | | | | | The autotests' rpath settings expect them there. Change-Id: I13e3b8fb9a65be16e980b8465ff2e89b9e01ec6b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Version bump to 4.6-rc1Eike Ziller2018-02-071-3/+3
| | | | | | | | | | Change-Id: I87c6a2452ad5ef86eb3146373a11124f3a199b32 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Build Qbs QML type info dynamicallyChristian Kandeler2018-02-021-0/+1
| | | | | | | | | | | | | | | | ... when building with qbs. Optionally also update the copies in the repository. Change-Id: I4604eff6de95101a8cb086708d5a9ef24af0fd32 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | qbs build: Disable Qt bundling functionalityChristian Kandeler2018-01-301-0/+1
| | | | | | | | | | | | | | This would otherwise come in from the qbs submodule. Change-Id: I44cc3ae5115146d3e051fcc0f78b1369205d3488 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | qbs build: Fix clang ProbeChristian Kandeler2018-01-251-1/+4
| | | | | | | | | | | | | | | | | | Due to the way JavaScript's split() function works, an empty string could end up in the list of dynamic libraries, causing a warning when building the pchmanagerbackend. Change-Id: I5af834d4f98af379ee346556b47c57cabf8c98db Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Update qbs submoduleChristian Kandeler2018-01-231-1/+1
| | | | | | | | | | | | | | | | To HEAD of 1.11 branch. Also do the adaptations necessary because of the branch switch. Change-Id: Ief69ef014c10397c14fcd68a9ca770d1391d5491 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-01-223-10/+13
|\| | | | | | | | | | | | | Conflicts: src/shared/qbs Change-Id: I5314559cbf188e4c339de44052c6e0c89d3c2aa6
| * qbs build: Fix libclang Probe for qbs > 1.10Christian Kandeler2018-01-182-6/+9
| | | | | | | | | | | | | | | | Probe configure scripts no longer have direct access to module instances. Change-Id: I87c5a7dbd44633cda5740d185829cecdc2d128e6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| * qbs build: Set minimum macOS deployment target unconditionallyChristian Kandeler2018-01-181-4/+4
| | | | | | | | | | | | | | | | | | | | The previous construct left the value undefined for Qt < 5.7. Task-number: QTCREATORBUG-19602 Change-Id: I6e6e5b0d3fb4ec76593c50bb13bad49f83b50dcc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | qbs build: Fix minimum Windows versionChristian Kandeler2018-01-191-1/+1
| | | | | | | | | | | | | | | | It's Windows 7, not XP. Change-Id: I0f058fae0e4af10ddca20967eb51594099ba8569 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | qbs build: Suppress some warningsChristian Kandeler2018-01-192-0/+5
| | | | | | | | | | | | | | Like in the qmake build. Change-Id: I7dc4a42bf3e4394a4fb6a579646d806f80fa3e96 Reviewed-by: David Schulz <david.schulz@qt.io>
* | 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>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-171-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/unit/unittest/gtest-creator-printing.cpp tests/unit/unittest/gtest-creator-printing.h Change-Id: I43d2571617bfbf41c0fcf23502ab77975540eba4
| * | 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>
* | | qbs build: Install debug info alongside binariesChristian Kandeler2018-01-124-5/+7
|/ / | | | | | | | | | | | | | | ... if separate debug info is enabled. Change-Id: I15a02b11e7df18719074b9bc503fe2c207f8bf00 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Improve failure message when usable libclang is not foundAlexandru Croitor2018-01-111-2/+3
| | | | | | | | | | Change-Id: Id541206c6b284be7a1068533825c88c9352f9d7f Reviewed-by: Christian Kandeler <christian.kandeler@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>
* | qbs build: Use the proper way to check the Qt versionChristian Kandeler2017-11-302-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Doing this via the product condition silently switches the product off if Qt is too old, which will leave users wondering about the reason. Instead, use the long-supported version check functionality of the Depends item, which will result in a clear message in case of a failure. Also, move the check to QtcProduct. The version requirement is for all of QtCreator, not just the plugins. Change-Id: Id445823e0243f5ad3b7a0ccb747a90e4fb18889b Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Orgad Shaneh2017-10-301-0/+4
|\| | | | | | | Change-Id: I7bc3615fb4bbafffa9636d731d8840445352b592
| * Suppress noexcept-type warnings also in qbs buildOrgad Shaneh2017-10-301-0/+4
| | | | | | | | | | | | | | This amends commit 68589a3fbc9afe4485baf728729c969e0f508385. Change-Id: Idf0e296f7549e8aea7109e0c877e27032b99e9b8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Require LLVM/Clang >= 5.0.0Nikolai Kosjar2017-10-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...for the code model parts and declare 5.0 as the supported version for the clang static analyzer. Adapt versions and tests, remove code assuming clang <= 5.0. LLVM/Clang 5 was released on 07 Sep 2017. Task-number: QTCREATORBUG-18931 Task-number: QTCREATORBUG-18657 Task-number: QTCREATORBUG-17187 Task-number: QTCREATORBUG-14881 Change-Id: I53b00258ca06a1d2e57f9379dacc54b310687295 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-252-0/+92
|\| | | | | | | Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
| * Add qbs project files for some clang-related tools and pluginsChristian Kandeler2017-10-232-0/+92
| | | | | | | | | | | | | | | | Change-Id: I4882be50c6b007715f7b281f95d111abc5cda62a Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Clang: Add more CLANG-UPGRADE-CHECK markersNikolai Kosjar2017-10-231-1/+1
| | | | | | | | | | | | Change-Id: I9ee553f29fa7a7f60291e2d7d2a56062dc722b9d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-192-1/+7
|\| | | | | | | Change-Id: Ie83666bd18e899dabf5190c360027bf02abecdaf
| * qbs build: Add missing definesChristian Kandeler2017-10-182-1/+7
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-093-7/+9
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/debuggerruncontrol.cpp src/plugins/projectexplorer/gcctoolchain.cpp Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
| * Merge remote-tracking branch 'origin/4.4' into 4.5Orgad Shaneh2017-10-041-0/+2
| |\ | | | | | | | | | Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
| | * Fix qbs build for qbs >= 1.10Christian Kandeler2017-09-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Shadowing modules does no longer work from qbs 1.10 on; we need to give our implementation of qbsbuildconfig a higher priority. Change-Id: I703b780d564c43ebc2a4318f683537f10c4e5f3c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Bump version to 4.4.1Orgad Shaneh2017-09-061-2/+2
| | | | | | | | | | | | | | | Change-Id: Ib65ad133f580fe0cca76ea31752134343b986dd6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * | qbs build: Use require() instead of loadExtension()Christian Kandeler2017-10-042-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a number of deprecation warnings. The require() function was introduced in qbs 1.8 and is safe to use now. Change-Id: I915a9f62f36fc64086c7dce60ea753d3e564127c Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Version bump for masterEike Ziller2017-09-271-3/+3
|/ / | | | | | | | | Change-Id: I0d2a37c4dd7435e55534538b7b2c4d9d69640e14 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Orgad Shaneh2017-08-302-1/+3
|\| | | | | | | Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
| * Bump minimum Qt version to 5.6.2Eike Ziller2017-08-291-1/+1
| | | | | | | | | | | | | | | | Starting to use macos qmake scope. 5.6.3 should be around soon so we can still regression test latest two patch levels. Change-Id: I14f67a26e26c50f6dd0fb8b621f13780b0b05f76 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * qbs build: Support new variable QTCREATOR_COPYRIGHT_YEARChristian Kandeler2017-08-241-0/+2
| | | | | | | | | | | | Change-Id: I2b5ca4f93456857b0c4ac8b7960982b28f5f0761 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 4.4.0Orgad Shaneh2017-08-181-5/+5
| | | | | | | | | | Change-Id: I1f282d5d30f76d9e0a3c2a32bab7de7933d349fa Reviewed-by: Eike Ziller <eike.ziller@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 04:48:05 +0000