Commit Graph

140 Commits

Author SHA1 Message Date
Cristian Adam
dad415b884 Terminal: add cmd shell integration when using clink
The script was provided at https://github.com/chrisant996/clink/discussions/453

If clink is not installed cmd will not have any issues, since only
the environment variable CLINK_PATH will be set.

Change-Id: I9f1d16933ae6bbcb3da1243e8704af6dc86b9a4d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-25 09:23:22 +00:00
Cristian Adam
71eb0ab9f8 CMakePM: Add CMake source file parser
Files taken from the CMake repository https://gitlab.kitware.com/cmake/cmake.git

624461526f4707a2406ebbd40245a605b6bd41fa (tag: v3.26.3)

Change-Id: I9ef388908cd22eb2748b5c17d039848ee23585b9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-20 11:34:29 +00:00
Eike Ziller
b36287731e Merge remote-tracking branch 'origin/10.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
	src/tools/perfparser

Change-Id: Ie5643100e0eb00e0933359dce320169b876f5634
2023-03-29 12:21:50 +02:00
Eike Ziller
81a5e2143c README: Add section on getting sources from git
Change-Id: I81b8d0e4e6d8df460f85bdd90b4688df2987bf6c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-29 08:34:10 +00:00
Marcus Tillmanns
bd52e53dbf Terminal: Add shell integration
Change-Id: Ic1e226b56f0103e5a6e7764073ab7ab241b67baa
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-16 06:08:09 +00:00
Marcus Tillmanns
82194d7e9c Terminal: Add required 3rdparty libraries
Change-Id: Ic477e305f78632f5c454cd639dfc7e41fb643fe1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-02-23 14:18:45 +00:00
Eike Ziller
1d5c587758 README: Add some more information wrt running and installing
Mention explicitly that running Qt Creator from the build directory
requires corresponding PATH setup on Windows, and add descriptions for
installing development files and debug information.

Fixes: QTCREATORBUG-26858
Change-Id: I63381c9ae1af3cd4d5db02a77164061b79ac814f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-02-09 12:40:57 +00:00
Eike Ziller
3f4c3a3db4 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/texteditor/texteditor.cpp

Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1
2022-12-20 11:05:01 +01:00
Eike Ziller
994626d1f6 README.md: Add/correct instructions for building perfparser
Change-Id: I7dbdc9a34fb3297957cdb93a6f042c4fb6282eea
Reviewed-by: hjk <hjk@qt.io>
2022-12-16 11:57:21 +00:00
Marcus Tillmanns
eca7044361 Utils: Add std::expected implementation
Adds a std::expected implementation that is compatible with >= C++11.

FilePath::fileContents and FilePath::writeFileContents as well as
FilePath::copyFile are changed to return std::expected.

A couple of macros have been added to aid in using the expected types.

An auto test was added showing how to use the library.

Change-Id: Ibe3aecfc1029a0cf13b45bf5184ff03a04a2393b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-14 10:39:29 +00:00
Cristian Adam
1323ad395a README: Add notes regarding correct Qt CMAKE_PREFIX_PATH
Users pass the value for Qt in `CMAKE_PREFIX_PATH` too deep like:
c:/Qt/6.2.4/msvc2019_64/lib/cmake/Qt6  and CMake can't find
all the components and weird errors are generated.

Task-number: QTCREATORBUG-28178
Change-Id: Icef7aef9e0933bd326ebd904623aac80c9f8e8c8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-09-15 13:21:49 +00:00
Eike Ziller
04e50438eb Utils: Remove Utils::optional
Since we are now requiring macOS 10.14 we can remove our local
implementation of optional and use std::optional for macOS too.

Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-09-01 06:58:04 +00:00
Eike Ziller
fe4e74af75 Adapt attributions to removal of Utils::variant implementation
Amends 84c1d6572b

Change-Id: I6cf02d577babb35537338447e4918776bd3012fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-08-29 08:21:05 +00:00
Eike Ziller
90a03391d7 Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
2022-07-12 13:56:23 +02:00
Eike Ziller
b338405477 Require Qt 6.2 for building Qt Creator
Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2022-07-11 13:36:18 +00:00
Leena Miettinen
0caa9b4cee Doc: Add info about troubleshooting Performance Analyzer
Fixes: QTCREATORBUG-27707
Change-Id: Icd2c5ad8ef79ecb7a2a2e37574a269e24bf55e71
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-07-11 08:55:27 +00:00
Eike Ziller
a3997cc05f README: Update recommended LLVM version
Change-Id: Ia7699ca9cd0045036f6034fd55c44264a0b53451
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-30 14:15:07 +00:00
Oswald Buddenhagen
1fcadf2cd2 fix wording regarding toolchains
Change-Id: I09c2d94af6791fab255d1a72a8484e78d6a239d2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-11 10:15:35 +00:00
Oswald Buddenhagen
691e3ff12d fix markup
Change-Id: I87f316aeff1d30c6df5758b7384c1020d8f7e55c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-28 16:54:41 +00:00
Knud Dollereder
ebac821e9e Replace minitrace with nanotrace
Minitrace is a library to produce json traces suitable for chromes
built-in trace viewer. Unfortunately it lacks the ability to add
custom arguments to the json files which is needed in our case
in order to examine Design Studios state from within the evaluating
python script. Nanotrace is a rewrite of minitrace that adds this
ability. Additional benefits are higher precision and the fact that
it is written in c++.

Change-Id: Id2610b93188483d88547369c3fa8dacbe4dee9f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-25 14:25:04 +00:00
Eike Ziller
33f2074272 Bump requirement to Qt 5.15.2
Qt 5.15.2 includes API that makes transitioning to Qt 6 easier.
We currently have workarounds for Qt 5.14 in place that we can
remove when requiring 5.15.2, and we also can stop adding workarounds
for new code.

Change-Id: I920fdccc41d755a6ad39cb5161cd916999fee755
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-17 10:20:32 +00:00
Cristian Adam
45e078541e Doc: Update Clang version / URL in README.md
Change-Id: Ic0e1865cf6761436a12d8f36d1af80e462118c2f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-13 11:07:49 +00:00
Eike Ziller
c2e27bd927 Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: I436d15f2aeefbf6fc80340f01398509c213fc1b1
2021-11-03 14:26:47 +01:00
Kai Köhne
75b6266694 Document third-party components by their upstream name
Also use a paragraph from the upstream documentation for
third-party code that missed it so far.

Change-Id: I2609d32eafca9810116f7a9ac2df9221541acb15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-11-02 13:22:51 +00:00
Eike Ziller
e8ba5b75cf Merge remote-tracking branch 'origin/5.0' into 6.0
Conflicts:
	src/plugins/android/androidpackageinstallationstep.cpp
	src/plugins/cppeditor/cppmodelmanager.cpp

Change-Id: I3bad38e1cfe717e98209d49461c9813a8e555eff
2021-10-26 09:13:24 +02:00
Kai Köhne
c565846723 Update details about LLVM/Clang in acknowledgments
LLVM moved to github a while ago - the old svn repositories are dead.
Furthermore, (almost) all of the code is now under the "Apache 2.0
with LLVM Exception" main license
(see also https://foundation.llvm.org/docs/relicensing/)

Change-Id: I8319f8479357c6182c5bf78b1ee7fe202e666980
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-21 14:10:59 +00:00
Eike Ziller
6a02aa2574 Merge remote-tracking branch 'origin/5.0'
Change-Id: I75aab10a066ce0e2d322663db7723825043fa9c8
2021-09-22 13:31:25 +02:00
Eike Ziller
56d346018a Acknowledgments: Fix path to cpluscplus lib
Change-Id: Id1a2f9797bff6b07d75d40c3ce5e6541aeea585e
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-09-21 07:35:30 +00:00
Eike Ziller
8e652e1586 Do not build Qbs by default
Compiling Qbs takes time and is not strictly necessary for the Qbs
integration in Qt Creator.
We still want to build it for the release, but let's not build it by
default anymore.

[ChangeLog][Building from Sources] Qbs is not built anymore by default.
Pass -DBUILD_QBS=ON on the CMake command line to enable it.

Change-Id: Ic5793e26c7f6a7ac92931777e5d77cef2c8bf888
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-07 13:16:11 +00:00
Eike Ziller
0777b65db3 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	src/plugins/android/androidconfigurations.cpp

Change-Id: If8dc2cdf131811e08ca147c6f58dbb3ed3bf7227
2021-08-26 11:09:08 +02:00
Eike Ziller
13123fede6 Update information about supported platforms
Change-Id: Ic6e2de15f07133dd60896a82f27280272db0e860
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-08-25 07:05:26 +00:00
Kai Köhne
ca885ee87a README.md: Document Qt Creator main licenses
Change-Id: I4d5803c746ebfc0a17e6c21745c1c8775e2d50f0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-08-24 07:07:47 +00:00
Knud Dollereder
caaad2107d Add minitrace library
Minitrace is a small C++ library used for adding trace points
into the code. When enabled with the build flag
BUILD_LIBRARY_MINITRACE set to true it will write a JSON file
containing these trace points to disk.
This file can be visualized with chromes builtin trace viewer
(about:tracing) which helps in profiling performance issues
and keeping track of performance regression.

Task-number: QDS-3766
Change-Id: I6109a72507b53c5e3ad8f9f504ff26a4fad206be
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-25 11:53:36 +00:00
Cristian Adam
cc0fa86ffd CMakeProjectManager: Add package manager auto-setup
Adds CMAKE_PROJECT_INCLUDE_BEFORE as initial CMake parameters
with a path to a auto-setup.cmake script that will run
conan install if a conanfile.txt is found in the prject.

A project can have a local QtCreatorPackageManager.cmake file
that will be loaded if exists.

The auto setup can be controlled via the following CMake variables:

* QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP
* QT_CREATOR_SKIP_CONAN_SETUP
* QT_CREATOR_SKIP_VCPKG_SETUP

conan.cmake is taken from https://github.com/conan-io/cmake-conan
which takes care of the conan specific compiler cruft. License
is MIT.

Fixes: QTCREATORBUG-25362
Change-Id: I70a6e1abc5600851d048f1590ca24204ce52a503
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-02-19 17:54:45 +00:00
Christian Kandeler
f7d8f8b704 ClangFormat: Do not refuse to build against unpatched clang
The plugin builds just fine and should be mostly (fully?) functional with
upstream clang, so it seems excessive to force-disable it entirely for
everybody not using our custom patch.

Change-Id: Id6a179c20325290a8205218c9514a16c1adc9076
Reviewed-by: hjk <hjk@qt.io>
2021-01-06 11:00:02 +00:00
Eike Ziller
45c2634166 Merge remote-tracking branch 'origin/4.14'
Change-Id: I62523c4733e617c46131048f5f62a2ca9be47d80
2021-01-06 08:42:15 +01:00
Alessandro Portale
16421d08d3 README.md: Use anchor links to "Getting LLVM/Clang..."
Finding a heading in the quite long README.md is challenging. If you try
to build with LLVM, you already have enough challenges. Use anchor links
to the "Getting LLVM/Clang for the Clang Code Model" heading.

Change-Id: Ie0b29cf2f0ad3331666be1f322de840db697cc7b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-01-04 20:47:43 +00:00
Alessandro Portale
b5037eb8cf README.md: Turn URL to prebuilt libclang into a link
Change-Id: I53ff97da00d5e1671c6af9444ed20d82a28e33dc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-01-04 20:47:40 +00:00
Eike Ziller
739eeec19d Explicitly state that only 64 bit Windows is supported
by our binary packages. Building on 32bit is still possible.

Fixes: QTCREATORBUG-25182
Change-Id: Ic88579bcd9bf3b6aef449e6ac3bcaa6430cd68f2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-01-04 10:14:03 +00:00
Eike Ziller
e2a2af5d18 Update and overhaul README
Our binaries no longer support Ubuntu 16.
Update LLVM requirements.
Move build instructions to use CMake and overhaul the complicated
Windows instructions.

Change-Id: Idf139fd76b0cfb91dbce11f7b814ec8abd9b21f6
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-14 12:26:58 +00:00
Leena Miettinen
ec6b6f3671 Doc: Add link to Qbs attributions into toplevel Readme.md
Task-number: QTCREATORBUG-24622
Change-Id: Icff751b12fc03d18f5d1fd4f8dd191a344a9981b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-20 09:41:48 +00:00
Eike Ziller
87ad222cb6 Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I3b48c76bbb456c487cec33383e7332b6a0a6752a
2020-10-06 09:49:57 +02:00
Leena Miettinen
7c1971e908 Doc: Point to the online docs from README.md
To advertise the docs on GitHub.

Task-number: QTCREATORBUG-21179
Change-Id: I39bac5cfb8f9749966c3b879b0a89c4e62d934f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 07:56:16 +00:00
Eike Ziller
423ea729f8 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportoptions.cpp

Change-Id: I3fd0d0a6a3ff30bb990da3dc0f78e69f9e1247ef
2020-09-23 10:11:44 +02:00
Leena Miettinen
1c26d6db68 Doc: Add OFL-1.1 to Acknowledgments
Fixes: QTCREATORBUG-24630
Change-Id: Iaaa64bb9936a80805affe992f64e24d1c586496a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 07:49:01 +00:00
Eike Ziller
5ad724c61b Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
2020-09-17 10:28:19 +02:00
Leena Miettinen
a489fc18eb Doc: Add LiteHTML license and related licenses to acknowledgments
Fixes: QTCREATORBUG-24619
Change-Id: I8d28bf8a579e8885b430cd7df292f53363990ffa
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-16 09:30:44 +00:00
Eike Ziller
3944162039 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
2020-08-10 15:56:54 +02:00
Orgad Shaneh
b4d5ab2fb5 README: Bump LLVM version in build instructions
Change-Id: I3321d422f109f8f9c96adef2f944415ce2ec9569
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-14 08:15:25 +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