Commit Graph

294 Commits

Author SHA1 Message Date
Christian Kandeler
d65ef60ea2 clang: Fix include/resource dir confusion
The getClangResourceDirAndVersion() function in ClangTools could return
the actual resource dir or the include dir, depending on the input. This
mistake happened because of misleading names spread all around the code.
Now the function returns what it says, and the other names are accurate
as well.

Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:18:30 +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
Christian Kandeler
3d718d3dae qbs build: Fix valgrind test failure
Change-Id: I563d9b61e0e281058dac46ed913b3102f70c4d90
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-27 14:25:07 +00:00
Christian Kandeler
e34ff64196 qbs build: Add convenience properties for sanitizers
Change-Id: I8c0908ed482127712c1cf4052d7b792be5ba79ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-27 13:56:34 +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
5a64a0c5be Require Qt 5.14 or later
This is required for proceeding with support for building
Qt Creator with Qt 6.

Change-Id: Ibf8a3eef6d6da943c5ee7f4a2239f45ee49b1093
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-09 08:34:46 +00:00
Eike Ziller
f4bc5df89e Bump version to 4.14 beta
Change-Id: I299dfae2c9422c1f02c3357109d426beaadbec7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-01 08:32:35 +00:00
Christian Kandeler
0861ba2fc9 sqlite: Fix qbs build
Exporting the full sqlite interface can lead to run-time conflicts with
the system sqlite that Qt's SQL support pulls in.
So re-build the sources for the unit test, as in the qmake build.

Change-Id: I8394b9c0aa4e21704bc84600f40b8f5d706ad66d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-16 12:43:00 +00:00
Christian Kandeler
f899c49dca qbs build: Add autotest dependency to QtcAutotest
So we can easily mark tests as flaky via build properties.

Change-Id: Ib1ad8e212980c9eb5622534fb9b20ad31128b91e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-04 07:19:53 +00:00
Eike Ziller
8dff37f0d3 Disable ClangRefactoring by default
It is too unstable even for experimental status.

Change-Id: I38e483eaece00aec0211a81414c6c5a000bf283f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-02 13:32:14 +00:00
Christian Kandeler
a03113832b qbs build: Make clang plugins build with libclang-cpp
Change-Id: Ifbae5f2a124e5c36126391d48b0a186bd153d678
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2020-05-26 13:09:07 +00:00
Eike Ziller
227904d4a6 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
2020-05-26 09:00:05 +02:00
Nikolai Kosjar
f6210b3569 qbs build: Clang: Adapt llvm-config variants to check for
Change-Id: Ib961efe9b72acdfc383cade2053a4a1126e99132
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-05-22 13:21:44 +00:00
Eike Ziller
146d3dc7e3 Bump version to 4.12.2
Change-Id: I734d8571ab672cbbccaebe6d3d1a97cd15f31831
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-22 08:13:13 +00:00
Eike Ziller
52b7ec058b Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
2020-05-15 14:49:11 +02:00
Christian Kandeler
8e1169f4bf qbs build: Take differences between clang and "apple clang" into account
In particular, clang with version number 10 is not really clang 10 on
macOS.

Change-Id: I8be489fa9cffd63c1ea8f13d181686ab1a575ec6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-12 07:31:39 +00:00
Christian Kandeler
050dec20dd qbs build: Fix excessive clang 10 warnings for qbs submodule
Change-Id: Ie1bb9833e00412d753b32c8267a9e9413aa66a7d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-11 09:33:01 +00:00
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
2020-05-06 09:43:20 +02:00
Christian Kandeler
bab97bf9b6 qbs build: Disable clang tooling plugins for llvm >= 10
They won't build with the new version.

Change-Id: I77c94817290418b0a97222465f0f8a8660053fae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-05 15:32:23 +00:00
Christian Kandeler
d08e5c33ff Qbs build: Suppress excessive warnings from Qt with clang 10
We get these thousands of times:
/usr/include/qt/QtCore/qbytearray.h:586: warning: definition of implicit
copy constructor for 'QByteRef' is deprecated because it has a user-
declared copy assignment operator [-Wdeprecated-copy]
    inline QByteRef &operator=(const QByteRef &c)
                     ^

/usr/include/qt/QtCore/5.14.2/QtCore/private/qmetatype_p.h:111: warning:
use of logical '||' with constant operand [-Wconstant-logical-operand]

Change-Id: I5f97f23d9b62ef1cd8d07495c46598d2a34a6d85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-04 11:57:05 +00:00
Eike Ziller
106e0430ed Bump version
Change-Id: Ieb662d20d5bba2e410039bcdeb2459129601187a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-28 06:11:58 +00:00
Eike Ziller
76617a5512 Bump version -> 4.12.0
Change-Id: I6894b5b095393981d9d42569ad43024e40711f94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-08 08:28:40 +00:00
Christian Stenger
bf6ecbb042 Update minimum Qt for Qbs builds
Change-Id: I5920b5c1bcdd0f186c9de6c1bb690334a5193051
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-02 10:50:42 +00:00
Eike Ziller
af29767857 Bump master->4.13.0-beta1
Change-Id: Ia25db16341e45f75c893c21c159775fd3428b538
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-20 07:21:45 +00:00
Eike Ziller
c6e03959d8 Bump version
Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-19 16:26:44 +00:00
Eike Ziller
4894afee52 Bump version -> 4.12 beta2
Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-06 14:19:52 +00:00
Christian Stenger
cf0e0be544 Qbs: Fix QC version branding
Change-Id: Idb15a97db6637c0218053c3754e09716a52a2f96
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-13 13:17:05 +00:00
Eike Ziller
0795a5ae6f Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
2020-02-07 10:41:09 +01:00
Eike Ziller
ca42bf7696 Bump version to 4.11.2 and copyright year to 2020
Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 11:41:42 +00:00
Christian Kandeler
c2501dc938 qbs build: Add litehtml support
Change-Id: Ia78ab35a5e844d5b2a1ee18752445c887228981f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-19 13:42:34 +00:00
Eike Ziller
0d005b7057 Version bump to 4.11.1
Change-Id: I31c53f92acd02c380e44ecea534b178a3fb5458c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-16 12:20:53 +00:00
Eike Ziller
76c54f5201 Update version to 4.12 beta
Change-Id: I13641e62b01b126493be852e5db3ef76044918f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-06 10:22:52 +00:00
Eike Ziller
50fad4f0f9 Bump version to 4.11.0
Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-29 13:43:54 +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
Eike Ziller
715db5ada8 Bump version -> 4.11.0-rc1
Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-04 11:59:19 +00:00
Eike Ziller
163faba8ff Bump version -> 4.11 beta2
Change-Id: Iea7b87cc19309eb4c3a921fa29d1b40170aaacc8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-21 08:45:26 +00:00
Tim Jenssen
333b33edbe Merge remote-tracking branch 'origin/4.10'
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
2019-07-12 15:53:56 +02:00
Christian Kandeler
b21d0485d0 qbs build: Suppress GCC 9 warnings also in qbs submodule
Amends 7b2d41a972.

Change-Id: I3500b57fa2424f522ffe16e5413a7593601215c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-09 09:26:32 +00:00
Tim Jenssen
1df6443d4a Merge remote-tracking branch 'origin/4.10'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/synchronousprocess.cpp
	src/plugins/baremetal/iarewtoolchain.cpp
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	tests/unit/unittest/CMakeLists.txt

Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
2019-07-04 15:17:55 +02:00
Christian Kandeler
7b2d41a972 qbs build: Suppress some GCC 9 warnings
Otherwise, we get thousands of warnings from Qt, e.g.:
    qvariant.h:275:25: warning: implicitly-declared ‘constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)’ is deprecated [-Wdeprecated-copy]

Change-Id: I8b3bbfae6791adca8bcfacc7ad5ab46701474aa4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-02 13:47:56 +00:00
Eike Ziller
b3de8fc809 Bump version to 4.10.0-rc1
Change-Id: I95991a4f46be2f2bc1600ca38d14b9b03269fc0b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-28 11:05:00 +00:00
Eike Ziller
52b9248385 Merge remote-tracking branch 'origin/4.10'
Change-Id: I452d5cbf27c1a0d43a890cef74cb8f0b9646bf60
2019-06-21 10:53:18 +02:00
Eike Ziller
bd3037464e Bump version
Change-Id: I5d2298e71837e3c146196f75a9bd1472771f1949
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:05:00 +00:00
Orgad Shaneh
8827d83115 Clang: Centralize -Wno-comment for GCC
It's also needed in clangrefactoringbackend, unittest etc...

Change-Id: I9c758d52b34798d75610a4633bc7c5e7ceb0c00b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-23 15:34:01 +00:00
Ivan Donchevskii
53c407bc0c Clang: Fix build with clang-8
Clang-Tidy checks and Clazy flags updated.
CLANG-UPGRADE-CHECK done.

Change-Id: I1ca585c5c3c77a7f183719df9c262603150914e8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-17 12:13:36 +00:00
Orgad Shaneh
82bf5e2906 Qbs: Enable ClangRefactoring by default
This amends commit 89e70ca785.

Change-Id: I09f7075075e2244a031e4c20496272f382ec020d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-04-11 21:50:45 +00:00
Orgad Shaneh
cbfc6e522d Merge remote-tracking branch 'origin/4.9'
Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
2019-03-01 13:06:57 +02:00
Christian Kandeler
52ec46a60f Fix build of command-line qbs with qbs
The plugin path we pass as a define to the qbs sources contained the "/
qbs/plugins" suffix which qbs already adds itself. Therefore, the
command-line qbs was not functional.

Change-Id: I2bfb967f998e69bbe4da760a1f517e1f40e4f055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-02-25 08:41:10 +00:00
Nikolai Kosjar
61775a844e Clang: Build clangformat only if clang/Format/Format.h exists
...in the LLVM_INSTALL_DIR.

Change-Id: I974f32759bca7fb467524bf61ff7967098748f0e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-02-21 09:10:03 +00:00
Alessandro Portale
88d1d92728 Bump minimum Qt version (to build Qt Creator) to 5.11
Recent adaptations to Qt 5.13's API deprecations require using APIs
which were introduces in Qt 5.11.

Change-Id: I6c077d824c9ce716e019543b290c355a5d512fad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-02-15 14:39:12 +00:00