Commit Graph

230 Commits

Author SHA1 Message Date
Eike Ziller
67b3d25624 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	qtcreator.pri

Change-Id: I278bc79cb64705471b360d0b8d06a8db17db7904
2019-02-08 12:48:19 +01:00
Eike Ziller
d07d75a08a Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
	qtcreator.pri

Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
2019-02-08 12:44:49 +01:00
Eike Ziller
523ddee6c0 Bump version
Change-Id: I90fac436cdab41739633c383445003a3c8f9feae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-02-07 15:14:35 +00:00
Eike Ziller
5481a35b98 Bump copyright year
Change-Id: I532c92311fda448fc272ab31e26ad562d9fb3ce5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-02-07 14:34:26 +00:00
David Schulz
14834e6b0a TextEditor: replace generic highlighter with ksyntaxhighlighting
Fixes: QTCREATORBUG-21029
Change-Id: I9894c4384e0e47da6bf030b7b8e07c3ad4737ff3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-01-28 11:37:08 +00:00
Eike Ziller
e6fe143795 Bump version to 4.8.2
Change-Id: I99f7baaab46a157f37e72619b71e968b37c330f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-01-17 12:35:25 +00:00
Eike Ziller
b79c0628e5 Bump version to 4.8.1
Change-Id: Ic5447ccb1e0a5e9b181d4210b2c84b526681c6da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-12-10 07:29:24 +00:00
Eike Ziller
a47fdf33a2 Version for master is 4.9.0-beta1
Change-Id: I2c3ca4910147445c4493828df5c6252f30379dc9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-29 12:37:55 +00:00
Eike Ziller
ca33c0b8c1 Bump version to 4.8.0
Change-Id: I593dc1905bd4e2240449fb9f393c2c14b73488f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-26 10:14:01 +00:00
Eike Ziller
b8156fdfe0 Version bump to 4.8 RC1
Change-Id: I67dbd98002f270bc053f3680adcf51034cde4593
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-19 09:10:51 +00:00
Orgad Shaneh
ea10f4d9da Increase QT_DISABLE_DEPRECATED_BEFORE to 5.9
Change-Id: I16b1fe72a9f9b87a8e7676a1591a5254d4005fad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-12 08:29:24 +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
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
Eike Ziller
2278ebed1e Merge remote-tracking branch 'origin/4.6' into 4.7
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp

Change-Id: I873a2fa112321225e7b478739fc017b01d24ce18
2018-05-14 09:44:43 +02:00
Eike Ziller
2c5e8e8d64 Support out of source support libraries
It was not possible to use QTC_LIB_DEPENDS if the library is not
in the Qt Creator source tree.
Provide a QTC_LIB_DIRS variable, similar to QTC_PLUGIN_DIRS.

Task-number: QTCREATORBUG-20382
Change-Id: I9120d221b6567f699881c0ad00d1f1e49ef3b920
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-05-09 13:16:14 +00:00
Eike Ziller
1f1be70546 Version bump to 4.6.2
Change-Id: I34702cbff029caa071f4e3556350011d84d26f2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-05-04 09:43:30 +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
7ba225cb79 Merge remote-tracking branch 'origin/4.6'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
2018-03-19 13:13:31 +01: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
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
437590a999 Merge remote-tracking branch 'origin/4.6'
Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
2018-01-23 17:06:59 +01:00
Eike Ziller
4947781bba Fix more issues with renaming Qt Creator executable
Change-Id: I826469bdd90e482a77f4cd65fd4fa7e541103a12
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-23 12:52:52 +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
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
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
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
2017-10-25 16:07:21 +02:00
Marco Bubke
68589a3fbc Disable GCC warning for noexcept
GCC >= 6.4 is generating warnings for function signature with noexcept. In
C++ 17 noexcept is part of the function signature. But the warning is
catching cases where a changed signature is not a problem, because it is
a template it self.

Task-number: QTCREATORBUG-18959
Change-Id: Ia6fa79c10e16d8c96a53c849ea15dcec94538fbe
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-24 14:24:08 +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
8645b27880 Version bump for master
Change-Id: I0d2a37c4dd7435e55534538b7b2c4d9d69640e14
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-27 06:48:10 +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
3b8362d0c4 Use 4.4 branch from binary artifacts
Change-Id: Id0e016d782f28a61422b9138a862c398b791be2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-05 18:50:21 +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
Orgad Shaneh
687466ac47 Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
2017-06-20 11:32:02 +03:00
Jake Petroules
5f45bb34ce Fix deployment target on macOS
According to the README, the minimum version is 10.8, but the code did
not reflect that reality.

Change-Id: I2bbaeefe614cba5b5fa8413b68202bb75f346d70
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-12 17:11:57 +00:00
Eike Ziller
82c71fe452 Version bump
Change-Id: Ifb7f3bf865a53b5bab06b2cd58d2a64eecbe2f21
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-24 11:36:34 +00:00
Eike Ziller
01a4d76cc1 Re-enable fast concatenation on macOS again
The old compilers that had issues with it should now long be unsupported

Change-Id: I49a30d1533814877ae4fde9c9bd4e3e64528dfa3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-18 06:24:31 +00:00
Eike Ziller
452a057179 Bump version
Change-Id: I744550af5e37d5863b42534608f2c8289b22c674
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-10 08:09:21 +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
Eike Ziller
1891af4b07 Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbs
Currently it is set by passing defines to qmake, which complicates
package build setups.
Set the display version where the numerical version is defined. This
also makes it available to developer builds. Also switch around the
display version and numerical version in the about dialog, since e.g.
"4.3.0-rc1" is more descriptive than "4.2.83".

Change-Id: I26dda427975acdc6cc169f8d625f57918167cf19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-21 13:28:54 +00:00
Eike Ziller
5a6390c544 Version bump for RC
Change-Id: I75dde3f981e3b7d72c181a5f0b582c7261d38e32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-19 08:56:54 +00:00
Eike Ziller
db6c85cdc9 Use 4.3 branch of binary artifacts
Change-Id: I9f41e92bd20f154cb73088b7e723a88fb54c3f02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-17 08:23:14 +00:00
Eike Ziller
23a3471ee8 macOS: Fix build issue with Qt 5.6
std::future is disabled when compiling with target 10.7, so
we need to enforce 10.8 when building against Qt 5.6 which has
default deployment target 10.7

Change-Id: I8d7b2646d0fb5268f82f5e01dae1f7e40a80bb8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-14 08:36:51 +00:00
Eike Ziller
37eddb8ac2 qmake build: Do not require 3rd party plugins to set c++14
Do it in qtcreator.pri instead again, since that is supposed to be
included by projects depending on Qt Creator.
Since we will use C++14 in utils/algorithm.h and other prominent
places, it would be very annoying to require setting C++14 on
all external plugins.

Change-Id: Ie11a30b33c791f3bf6db39fcee454f1e887352c2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-30 08:21:34 +00:00
Eike Ziller
36b443dfba Add defines for relative data paths
Derive the relative paths used in code from the paths used by the build
system.

Change-Id: I208ee55d3c1ee76921734f5c1c6c40d3fcb9724c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-12-01 14:24:53 +00:00