Commit Graph

109 Commits

Author SHA1 Message Date
Nikolai Kosjar
3160172b58 ClangFormat: Fix constructing libs for qbs
Assignment after concat() was missing.

Change-Id: I9a038cae6372648561a5450e9e3417c4c603ab7e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-16 11:06:22 +00:00
Eike Ziller
50d9e58ede Bump version to 4.8 beta2
Change-Id: Ie8034adcc95a188d5a78a71b303fc073ea1d6a3c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-12 08:19:23 +00:00
Ivan Donchevskii
e0d7d03720 Clang: Fix ClangFormat build with clang-7
Change-Id: I0859b7aad1a49f8d46ee4b32cc32039cfa0b482b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-05 11:08:27 +00:00
Alexandru Croitor
9da9ed45e9 Fix qbs build of clangformat plugin
Change-Id: Ic23a34048c62ed39590ad422ea3e4f8fea9fc5a1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2018-09-25 06:03:49 +00:00
Christian Kandeler
3336baad12 Fix references to the clang code model documentation file
Was forgotten in 7ab07a4e8f.

Change-Id: I2c6d21b79658e3946eb6ecdcf7b11992c0bf865e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-08-20 11:58:18 +00:00
Eike Ziller
db9837fa6c Merge remote-tracking branch 'origin/4.7'
Conflicts:
	src/plugins/clangtools/clangtoolruncontrol.cpp
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
2018-08-15 13:53:28 +02:00
Christian Kandeler
8cfd5b165a Fix qbs build when no llvm is present
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>
2018-08-10 09:57:38 +00:00
Christian Kandeler
a44fe2e4f0 SSH: Use Botan2
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>
2018-08-10 09:23:42 +00:00
Eike Ziller
efdf4fcbc4 Version bump to 4.7.1
Change-Id: I428ed0c2643193caec1e6a0f47eff8f55df55ef2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-18 13:54:16 +00:00
Eike Ziller
21ac38aca9 Version bump to 4.7.0
Change-Id: I339097aa2a0deeeea4bd81a9a8b74c6732bb217d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-06 10:30:50 +00:00
Ulf Hermann
9a4f0317c1 Clang: only build with LibTooling if explicitly enabled
The feature is experimental and should not be used, yet.

Change-Id: Ifb9a651dcbaade5801ac28f900030407f12dc844
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-27 06:57:19 +00:00
Eike Ziller
629b5abd7e Bump to 4.7-rc1
Change-Id: I071ef81b3285102eeedba7d475aabfda762926d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-26 05:16:35 +00:00
Eike Ziller
69d7b72837 Rename to 4.7.0-beta2
Change-Id: I6f5a5eb2dc9f12691e14ff4dac3da5aa732d96ab
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-14 11:08:15 +00:00
Eike Ziller
5921376573 Bump version to 4.7.0-rc1
Change-Id: I8be1dbdc726ec2b5520dbceb19973337afb71583
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-06 07:51:30 +00:00
Eike Ziller
d2a9e1b892 Merge remote-tracking branch 'origin/4.7'
Change-Id: I00dd929a4ed32af8f1b76cea57a7c49239dafc7c
2018-05-22 09:55:58 +02:00
Nikolai Kosjar
319daa2612 Clang: Require LLVM/Clang >= 6.0.0
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>
2018-05-17 12:46:37 +00:00
Eike Ziller
01dd22dc08 Version bump for 4.8 beta
Change-Id: Ib61d6d6d6f2433299fe7867576a7c7d8558011ac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-05-16 10:40:54 +00:00
Ivan Donchevskii
52ac74b61c ClangTools: Remove clang executable settings
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>
2018-05-04 09:58:37 +00:00
Eike Ziller
428fcb476b Merge remote-tracking branch 'origin/4.6'
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
2018-04-13 10:54:42 +02:00
Christian Kandeler
d2d5208819 qbs build: Enable the vcs module only for commercial plugins
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>
2018-04-04 12:08:40 +00:00
Eike Ziller
603b031ab2 Version bump to 4.6.1
Change-Id: I814d2b864dff341977a41c4d03d96de465a72775
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-28 10:11:53 +00:00
Eike Ziller
f4b13dc77c Version bump to 4.6.0
Change-Id: Ibf3dd86a654080cb9b5ab2a4fd790f8f59879787
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-16 12:19:01 +00:00
Eike Ziller
0b10ecc718 Merge remote-tracking branch 'origin/4.6'
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
2018-03-13 11:25:38 +01:00
Christian Kandeler
6d3f2e4317 qbs build: Suppress vcs header file creation
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>
2018-03-12 09:32:43 +00:00
Eike Ziller
124e4499eb Merge remote-tracking branch 'origin/4.6'
Change-Id: I421af2d62994436782dab6d37e97622bd055ed44
2018-03-05 09:28:34 +01:00
Eike Ziller
994a68280e Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: Iaf254ce5bc895c703aa6772b4aaa139e531696f6
2018-03-02 15:55:29 +01:00
Eike Ziller
8673aae986 Allow plugins to specify a "revision" to show in addition to the version
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>
2018-03-02 12:33:32 +00:00
Eike Ziller
5d9a623a33 Bump version
Change-Id: I4ea26ca1bfeedc2b57c9ffcae855035c47189935
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-22 07:03:48 +00:00
Eike Ziller
b99755fdb0 Version bump to 4.6-rc1
Change-Id: I87c6a2452ad5ef86eb3146373a11124f3a199b32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-07 11:38:39 +00:00
Eike Ziller
5432dd1f5c Merge remote-tracking branch 'origin/4.6'
Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
2018-02-07 11:58:23 +01:00
Christian Kandeler
bc15b47487 Build Qbs QML type info dynamically
... when building with qbs. Optionally also update the copies in the
repository.

Change-Id: I4604eff6de95101a8cb086708d5a9ef24af0fd32
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-02 09:14:01 +00:00
Eike Ziller
ecb9fae785 Merge remote-tracking branch 'origin/4.6'
Conflicts:
	share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
	src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
2018-02-01 09:58:36 +01:00
Christian Kandeler
860b89b49c qbs build: Disable Qt bundling functionality
This would otherwise come in from the qbs submodule.

Change-Id: I44cc3ae5115146d3e051fcc0f78b1369205d3488
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2018-01-30 10:56:14 +00:00
Christian Kandeler
1838057c22 qbs build: Fix clang Probe
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>
2018-01-25 15:36:24 +00:00
Eike Ziller
437590a999 Merge remote-tracking branch 'origin/4.6'
Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
2018-01-23 17:06:59 +01:00
Christian Kandeler
ff0d67dcd2 Update qbs submodule
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>
2018-01-23 08:55:40 +00:00
Eike Ziller
8921888ce3 Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
	src/shared/qbs

Change-Id: I5314559cbf188e4c339de44052c6e0c89d3c2aa6
2018-01-22 12:46:10 +01:00
Christian Kandeler
51ddd4bcfd qbs build: Suppress some warnings
Like in the qmake build.

Change-Id: I7dc4a42bf3e4394a4fb6a579646d806f80fa3e96
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-19 14:36:44 +00:00
Eike Ziller
0837f974da Merge remote-tracking branch 'origin/4.6'
Conflicts:
	qtcreator.pri

Change-Id: I7dcd8e067b7597144eb3b27d917cb7fe0279aad4
2018-01-19 12:05:11 +01:00
Christian Kandeler
c278c26cb6 qbs build: Fix libclang Probe for qbs > 1.10
Probe configure scripts no longer have direct access to module
instances.

Change-Id: I87c5a7dbd44633cda5740d185829cecdc2d128e6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-18 09:31:41 +00:00
Eike Ziller
47ad489b97 Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I52986bd2557490431bae48f9db86c848a95592d2
2018-01-17 16:28:18 +01:00
Eike Ziller
205387ad06 Bump displayed copyright year
Change-Id: I5cb95e9b4736279b547208f303a5453f5a4f9dc5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-17 13:24:48 +00:00
Eike Ziller
9a57f19552 Bump version
Change-Id: I7ab954a3d696203a392e618933e8f075466af61a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-17 12:44:26 +00:00
Eike Ziller
7872ddde4c Make executable name configurable
Change-Id: I6b5420ab2275c37e51f665005e31b80b6dfae8cb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-01-16 10:53:59 +00:00
Eike Ziller
61b5bbc8e9 Qbs build: Fix that copyright was not adapted in Info.plist
Change-Id: Ie5670a4a420f34dbef6cbb204063e8921eafd82b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-01-16 10:53:46 +00:00
Alexandru Croitor
b65c13c6a5 Improve failure message when usable libclang is not found
Change-Id: Id541206c6b284be7a1068533825c88c9352f9d7f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-11 13:32:37 +00:00
Eike Ziller
699dd2c426 Make IDE name and ids configurable at build time
Make it unnecessary to hack app_version.h.in for that.

Change-Id: Ibc3bf332916ab9f293b6782d3b5a40078dbd7bcb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 08:45:59 +00:00
Eike Ziller
527fd0fa4c Version bump to 4.5.1
Change-Id: Ifb5656f33cdb4370c1c654c8d98587071528a72f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-12-12 09:32:02 +00:00
Eike Ziller
92a91a38f6 Bump version
Change-Id: Ie823825b9dd4092f9997716790bfc3fbe138dd46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-24 11:00:03 +00:00
Nikolai Kosjar
5ba40cb7fb Clang: Require LLVM/Clang >= 5.0.0
...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>
2017-10-27 14:21:19 +00:00