Commit Graph

87 Commits

Author SHA1 Message Date
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
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
2017-10-25 16:07:21 +02:00
Christian Kandeler
3bcbcfa626 Add qbs project files for some clang-related tools and plugins
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>
2017-10-23 12:18:34 +00:00
Nikolai Kosjar
f19facd378 Clang: Add more CLANG-UPGRADE-CHECK markers
Change-Id: I9ee553f29fa7a7f60291e2d7d2a56062dc722b9d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-23 11:02:18 +00:00
Eike Ziller
bb9663529b Merge remote-tracking branch 'origin/4.5'
Change-Id: Ie83666bd18e899dabf5190c360027bf02abecdaf
2017-10-19 13:01:12 +02:00
Christian Kandeler
527594bb83 qbs build: Add missing defines
The string concatenation macros were not set, as opposed to the qmake
build.

Change-Id: I32e2c72c891419ef8352cb7b46e3b7f9b82b6312
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-10-18 14:18:41 +00:00
Eike Ziller
89ac5b5603 Version bump to 4.5-rc1
Change-Id: I5d7d3ec295feb60ad0d944b4f68344c1857146ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-13 10:01:40 +00:00
Eike Ziller
07bec99e8f Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
2017-10-09 12:09:27 +02:00
Orgad Shaneh
5e8e619dd0 Merge remote-tracking branch 'origin/4.4' into 4.5
Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
2017-10-04 16:11:17 +03:00
Christian Kandeler
a6d12177ad qbs build: Use require() instead of loadExtension()
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>
2017-10-04 08:18:15 +00:00
Eike Ziller
8645b27880 Version bump for master
Change-Id: I0d2a37c4dd7435e55534538b7b2c4d9d69640e14
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-27 06:48:10 +00:00
Christian Kandeler
f45369b8f5 Fix qbs build for qbs >= 1.10
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>
2017-09-26 14:02:44 +00:00
Orgad Shaneh
ff9e745e0f Bump version to 4.4.1
Change-Id: Ib65ad133f580fe0cca76ea31752134343b986dd6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-06 08:19:27 +00:00
Orgad Shaneh
139792ee25 Merge remote-tracking branch 'origin/4.4'
Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
2017-08-30 01:24:11 +03:00
Christian Kandeler
70b37058b8 qbs build: Support new variable QTCREATOR_COPYRIGHT_YEAR
Change-Id: I2b5ca4f93456857b0c4ac8b7960982b28f5f0761
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-24 13:10:24 +00:00
Orgad Shaneh
e1cca00905 Bump version to 4.4.0
Change-Id: I1f282d5d30f76d9e0a3c2a32bab7de7933d349fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-18 13:40:44 +00:00
Eike Ziller
bb145847d7 Bump version to 4.4 rc1
Change-Id: I7d78ce4ed70a14cfea95cfac4a852ba715e64fb1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-26 11:05:51 +00:00
Eike Ziller
efa5a7b6d7 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
2017-07-25 11:54:44 +02:00
Kai Koehne
68fe72e99a Define COPYRIGHT_YEAR in build files
This allows us to use the copyright year also in the following
patch that adds it as metadata to the windows executable.

Ideally we'd unify IDE_YEAR and IDE_AUTHOR (because they're
only used together anyway) but that would break translations.

Change-Id: If0f84eaeb22e9ba71b2b29798324b76a91eda78f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-25 09:05:43 +00:00
Eike Ziller
d522ec373f Merge remote-tracking branch 'origin/4.4'
Change-Id: Iec15792ab28b3d34234d8e564a8ee33808772fa8
2017-07-12 10:52:25 +02:00
Christian Kandeler
dc1bdc9bec qbs build: Adapt to renamed Qt.core property
Change-Id: Ie05ad37ae7711a6deb152c5aa0a926e9b83b082b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-10 11:51:46 +00:00
Eike Ziller
e016918e5f Version bump
Change-Id: Ie00f23af54a9c615756d5f578587879163f708cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-05 18:50:10 +00:00
Eike Ziller
57b3f7debb Fix version information
master will become 4.4

Change-Id: I2c32496cdf9bad1c46d89e71145034e248e78171
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-25 15:43:11 +00:00