aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Bump version -> 4.12 beta2Eike Ziller2020-03-061-3/+3
| | | | | Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Less file creating during configureCristian Adam2020-03-021-11/+10
| | | | | Change-Id: I263853f0a903d81a8d869bc4f5683e1a1b0078e2 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake Build: Fix yaml-cpp include directory detectionCristian Adam2020-02-261-0/+5
| | | | | | | | On Ubuntu 19.10 the libyaml-cpp-dev CMake config module has a broken value for YAML_CPP_INCLUDE_DIR. Change-Id: I5097ef656b988dda0326a15b521b92cbbdb0a390 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake Build: Add qtdiag to Dependencies install targetCristian Adam2020-02-262-1/+24
| | | | | Change-Id: If1c56ff6e366ec4d5c4bb97e4a176cf9cf8dc4c5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMake build: Add a qtc_glob_resources functionAlessandro Portale2020-02-241-0/+13
| | | | | | | | | This is the CMake equivalent of "RESOURCES = $$files()" from qmake. Use it in StudioWelcome for the Qml resources. Change-Id: I2f495e2c4bad9f0bb488dee7e8966e31acb51b5a Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* GitHub Actions: Fix MSVC CDB debuggerCristian Adam2020-02-191-0/+13
| | | | | | | Install the VC Runtime for the qtcreatorcdbext component Change-Id: I22a7620be51acca53313bcac4b54746214d7b13f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMake Build: Set CXX_EXTENSIONS to OFF for QtCreator pluginsCristian Adam2020-02-191-0/+3
| | | | | | | | | This makes sure that if you have a plugin and set the C++ standard to 14, but forget to set CXX_EXTENSIONS to OFF you don't get weird PCH compilation failures. Change-Id: I66edf6431624f667ba400e8ef79f2ad6170e3ca2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Do not set suffix for qtcreatorcdbext dllCristian Adam2020-02-191-2/+2
| | | | | Change-Id: Id0b5692df1661fe1e20b77d1e538c01fbb974b5e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Skip PCH for targets that do not have QT_NO_CAST_TO_ASCIICristian Adam2020-02-141-0/+6
| | | | | | | One example is perfparser_lib. Change-Id: I63f20dcba3aedbc8fbf948d30980baf6afd8c110 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Add CMAKE_PREFIX_PATH to the HINTS paths for elfutilsCristian Adam2020-02-131-2/+2
| | | | | Change-Id: I0d4a8974c943a33e538ee2412258401e89ea3c1f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Exclude Dependencies component from ALLCristian Adam2020-02-132-0/+5
| | | | | Change-Id: Iedc69399ec2983ecd3359969bf80bdcdfafad37a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Fix libexec path on LinuxEike Ziller2020-02-131-1/+1
| | | | | | | It's just libexec/qtcreator/ without a trailing bin/ Change-Id: I96015dc5c3bb023dabd5b64f1bb9f83bd85b4d51 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake Build: Use install component DependenciesCristian Adam2020-02-122-5/+9
| | | | | | Fixes: QTCREATORBUG-23593 Change-Id: If9861a0ee09f2ce12ac093c2fde600a77958723a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Put wininterrupt and cdbextension into separate componentsEike Ziller2020-02-111-4/+56
| | | | | | | | And make it possible to turn off building the cdbextension library. So they can be installed and packaged separately Change-Id: Ic7da1411aa3973604b897e1cbf57ad9c5b0fe460 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Core: Turn the IDE revision link in VersionDialog to be Opt-inAlessandro Portale2020-02-101-3/+0
| | | | | | | | | If IDE_REVISION is set, don't default to some hardcoded string for IDE_REVISION_IDE_STR. Task-number: QTCREATORBUG-23524 Change-Id: Icc6aa6a4a0fb24178c5c1bd5feaa96b6a5b07115 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-02-071-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
| * Bump version to 4.11.2 and copyright year to 2020Eike Ziller2020-02-061-3/+3
| | | | | | | | | | Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake Deployment: Move creation of qt.conf to add_qtc_executableCristian Adam2020-02-063-65/+70
| | | | | | | | | | Change-Id: Icbeed128cc99b077aad925f278aaf9534d3f9fec Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Deployment: Remove Dependencies componentCristian Adam2020-02-062-0/+251
| | | | | | | | | | | | | | | | | | - Install will also copy the dependencies. - Made the dependencies search recursive, not just two steps - Moved install code to a script, not having to escape quotes and dollars Change-Id: I6c5fb19e4094e9dcd4b339d5b90be6e7c5055223 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Deployment: Fix deployment / rpath handing on LinuxCristian Adam2020-02-061-6/+16
| | | | | | | | | | Change-Id: Ic8eb8665e4ac43a49ecbf07f2a92873453c9faca Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Build: Brought back GoogleTest unittestCristian Adam2020-01-311-1/+1
| | | | | | | | | | | | | | | | It was removed by accident from ctest, and it was not ran on GitHub Actions. Change-Id: I044bc5fc96e71211982c07c8796974e97fff5737 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Build: Add include guards for QtCreatorAPICristian Adam2020-01-311-0/+5
| | | | | | | | | | | | | | | | Commit e8fceb821e3e18ba2d2230c02b6e0cd31d119d03 re-includes the file, and things go bad. Change-Id: Ifad79824f1a64459cd01337656b1a1300f49d06b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake Build: Add Dependencies install targetCristian Adam2020-01-301-0/+33
| | | | | | | | | | Change-Id: I17f8d26500a9a75bef64e23c3b64492c1bb929cc Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake: Fix DesignerComponent detection for MSCV/debugAlessandro Portale2020-01-281-1/+1
| | | | | | | | | | | | Change-Id: Ia5e7a26891f062d040dcfd9a395c5e1b4cbaf321 Hack: Also search for "d" versions of the library. Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake Build: set a 5s timeout per testCristian Adam2020-01-281-1/+5
| | | | | | | | | | | | | | | | | | | | At the moment MinGW build is running for 5 hours because a test hangs. The test suite should finish the 2700 tests in 120 seconds. Change-Id: I71e2e740f916bb304c91a6a3054ae097b4076543 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Build: add perfparserCristian Adam2020-01-282-5/+96
| | | | | | | | | | Change-Id: Ib16548befefbb827f2752300f9e67da3cf91570c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Core: Let the clickable link in VersionDialog jump to git logAlessandro Portale2020-01-241-1/+1
| | | | | | | | | | | | | | ...instead to just one commit. Change-Id: I8bb53ba3e7f4fcfb2fb306afe2a06a2b63dc89d8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Core: Fix non-CMake compilation with IDE_REVISIONAlessandro Portale2020-01-241-1/+1
| | | | | | | | | | | | | | amends ae9fbd04dd932707e8538676343ec6c6d5bcd250 Change-Id: I746a89b21ee07aecad525b7b91fe1f360ad1e853 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CMake build: Some clean up for macOSEike Ziller2020-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | Don't install qtcreator.sh, it cannot be used. Don't install application into bin/ subfolder. App-bundles do not follow the UNIX bin/, lib/, share/ convention, so don't even try. (This makes bundling it into a 7z consistent with what we do on the other platforms.) Change-Id: Ib3faa2909a9b30a11193586f279528f1b8bd96fa Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Core: Make the revision sha in VersionDialog a clickable linkAlessandro Portale2020-01-231-0/+3
| | | | | | | | | | | | | | | | | | The base URL can be defined via the IDE branding mechanism. If omitted, the revision is plain text, like before this change. Change-Id: If1a74707a10c76e15d3d25b8e6b0c302219fb91d Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake build system: Fix skipping tests with unmet dependenciesAlessandro Portale2020-01-161-1/+1
| | | | | | | | | | | | | | | | Handle google tests amends: I0eadf5 Change-Id: I02837e2e3edcb7f4d9ae07991e2e311226c37a28 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake build system: Skip building tests with unmet dependenciesAlessandro Portale2020-01-161-0/+6
| | | | | | | | | | Change-Id: I0eadf5a8d2c98486d2d8aabfe835f5ab0dbc9190 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake Build: do not set .dll extension for static libraries on WindowsCristian Adam2020-01-151-1/+1
| | | | | | | | | | Change-Id: Ic0cd8958641577164e7291f103dbd571fb0024cb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-01-151-0/+1
|\| | | | | | | Change-Id: Ib47833b23e90c5f08b318d3d4985a4f3a450ee4b
| * CMake build: Fix version number in library file namesEike Ziller2020-01-141-0/+1
| | | | | | | | | | | | | | Make it compatible with the qmake build, with just the major version. Change-Id: I3134b21b4775e7e83d135652dd66a51f3bdf91ab Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Version bump to 4.11.1Eike Ziller2019-12-161-2/+2
| | | | | | | | | | Change-Id: I31c53f92acd02c380e44ecea534b178a3fb5458c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake Build: match qmake naming scheme on WindowsCristian Adam2020-01-141-0/+16
| | | | | | | | | | | | | | Plugin4.dll and Library4.dll Change-Id: Ifec8c04f4f0f2ee4315d31db288379fad2b41d48 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Orgad Shaneh2019-12-071-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/mcusupport/mcusupportrunconfiguration.cpp src/plugins/python/pythonproject.cpp src/plugins/qmakeprojectmanager/qmakestep.cpp src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
| * CMake Build: do not fail to install on missing targetsCristian Adam2019-12-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | The install target will install all targets that what have been built. If some plugin is not being built (all Clang* plugins) by not having the necesssary dependencies, it's not a failure not to have that plugin at installation time. Change-Id: I78b71a3fcae462d3eae7520744bfebab3f924bb4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Bump version to 4.11.0Eike Ziller2019-11-291-3/+3
| | | | | | | | | | Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Update version to 4.12 betaEike Ziller2019-12-061-3/+3
| | | | | | | | | | Change-Id: I13641e62b01b126493be852e5db3ef76044918f7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-111-2/+6
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/genericprojectmanager/genericprojectplugin.cpp src/plugins/projectexplorer/environmentaspect.cpp src/plugins/projectexplorer/environmentaspect.h src/plugins/projectexplorer/environmentaspectwidget.cpp Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
| * CMake: Make sure that explicit plugin.h files depend on the json fileCristian Adam2019-11-071-1/+5
| | | | | | | | | | | | | | | | ClangCodeModel plugin was not updating its version number because of the EXPLICIT_MOC call. Change-Id: I109d80c93d8af628c8981d49c93dcb0ebe21f1ee Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * macOS: Fix execution of helper executables with UIEike Ziller2019-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-041-3/+3
|\| | | | | | | Change-Id: Ie951c531a5b2efd8e6b972c4d04b7f1c681c8ef9
| * Bump version -> 4.11.0-rc1Eike Ziller2019-11-041-3/+3
| | | | | | | | | | Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Windows: Remove explicit usage of _WIN32_WINNT and WINVER macrosCristian Adam2019-10-311-0/+7
|/ | | | | | | | | The are set in a central place, in the precompile header file. Or as DEFAULT_DEFINES when the precompile header file is not used. Change-Id: Ie020f916b64eabcd5a8153f4be5474986f5afed5 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMake Buildsystem: Enable visibility settings for binariesTobias Hunger2019-10-211-0/+2
| | | | | | | | | This should not matter, but makes the add_qtc_executable targets match up with the PCH, so that they should build a bit faster. Change-Id: Ibecaaf7fd98d5b927d52e4956b1bea4a5775afba Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Bump version -> 4.11 beta2Eike Ziller2019-10-211-3/+3
| | | | | Change-Id: Iea7b87cc19309eb4c3a921fa29d1b40170aaacc8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake BuildSystem: Fix visibility handling for PCHTobias Hunger2019-10-161-1/+11
| | | | | | Change-Id: Ib91f03cf4f13ddefe365cf1e59cc083d700f0672 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: hjk <hjk@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 09:48:10 +0000