Commit Graph

238 Commits

Author SHA1 Message Date
Orgad Shaneh
d890534ec5 Project: Add CMakeLists.txt to qmake project
Change-Id: Ifc8246bb801c7e9350c0aabe8debd847063192ac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-27 13:56:43 +00:00
Eike Ziller
119994c62d qmake build: Add alias for C++17 that is available in older Qt versions
We use Qt 5.9 to build a separate sdktool, for platform compatibility,
but that doesn't have 'c++17' yet.

Change-Id: Id6602e95d418d7d93b19e2b1ad60f13e1acf7280
Reviewed-by: hjk <hjk@qt.io>
2020-08-18 07:45:10 +00:00
hjk
52b2ca55c9 Replace QT_USE_FAST_{OPERATOR_PLUS,CONCATENTION} by QT_USE_QSTRINGBUILDER
QT_USE_FAST_CONCATENATION doesn't do anything nowadays.

Using QT_USE_QSTRINGBUILDER is the same as QT_USE_FAST_OPERATOR_PLUS
for QStrings and enables more QStringBuilder use for QByteArrays.

Change-Id: Ibd297817c50d86661d47822799f989447249af1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-07 12:45:03 +00:00
hjk
6b7c823ce9 Qmake build: Add core5compat globally for Qt6 builds
We use QTextCodec all over the place, so a finer-grained solution
doesn't buy us much.

Task-number: QTCREATORBUG-24098
Change-Id: I31c73781fe04db597f7d690bf72829f268333e24
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-13 12:53:53 +00:00
Eike Ziller
d400dce35d Require GCC 7 and enable C++17
Fix MSVC2019
- result type of conditional expression is ambiguous:
  types 'const char [1]' and 'QByteArray' can be converted
  to multiple common types

Fix MinGW 8.1
- undefined reference to SemanticHighlightNotification::methodName

Fix Utils::transform with std::vector for GCC & MSVC

Unfortunately we cannot get rid of the special variant and optional
implementations, because Apple Clang requires deployment target >= 10.14
for the functions that can throw std::bad_optional_access.

Fixes: QTCREATORBUG-20520
Change-Id: I5c36a70f21f8b0215d2f4fc5c0653a022778d928
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-10 11:52:24 +00:00
Eike Ziller
4843216192 macOS: Fix execution of helper executables with UI
The qt.conf that is written into the Resources/ folder
is used for the main Qt Creator executable, so that cannot
be used for the helper executables.

Move the executables one more level down and add a separate qt.conf
for them.

Fixes: QTCREATORBUG-23120
Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 12:31:40 +00:00
hjk
1b4766e26c Enforce QT_NO_JAVA_STYLE_ITERATORS
We don't use them and Qt is likely to deprecate them.

Change-Id: Ib2fbb3f509081f5eb7aae6c41dd330cc57db59e1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:02:37 +00:00
Tim Jenssen
8000a3e70b add brand QtCreator to something else feature
- this patch enables branding QtCreator to something else
   excluding the logo icons which will follow in a later patch
 - qtcreator_ide_branding.pri is always included, so only
   need to write the values we want to override in a
   IDE_BRANDING_PRI file
 - if there is no BINARY_ARTIFACTS_BRANCH it won't checkout
   that repository

Task-number: QTCREATORBUG-22226
Change-Id: I592b40025cc53988224770b704622874f2174593
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-02 14:35:13 +00:00
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