summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Build: Avoid passing unsupported flag to MSVC linkerOrgad Shaneh2023-05-161-1/+1
| | | | | Change-Id: Ia73aeccb824bca10ce928cb82d5ad77033521527 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Add -fPIC also for OBJECT librariesCristian Adam2023-05-121-1/+1
| | | | | | | | | | add_qtc_library would have set the POSITION_INDEPENDENT_CODE property for STATIC libraries on UNIX based systems. The OBJECT libraries need the same treatment. Change-Id: Ia333a36ea0f35d7db3ed876cdde5b895b47644c7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Build: Add SOURCES_PROPERTIES to extend_qtc_targetEike Ziller2023-04-211-1/+5
| | | | | | | | This way the check if the target is enabled and the condition is met doesn't have to be done manually. Change-Id: If490a84fd5f1ede2d032c3800f69ede4f755bc2c Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-04-131-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/python/pipsupport.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/qtsupport/examplesparser.cpp tests/auto/examples/tst_examples.cpp Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
| * Build: Fix result of ts_ targetsEike Ziller2023-04-111-1/+1
| | | | | | | | | | | | | | | | | | Created .ts files with the wrong name. Amends 556e7315f7125be80397e9b5b29c994e5410acd4 Change-Id: I3c0199c564f47dce178a9d8218d5dacf8c75f78a Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Bump version to 10.0.1Eike Ziller2023-03-291-2/+2
| | | | | | | | | | Change-Id: I6828aa83a6ce828a12b30e1a0d942ec64f582cbe Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2023-03-301-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/filepath.cpp src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp tests/unit/unittest/CMakeLists.txt Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee
| * \ Merge remote-tracking branch 'origin/10.0' into qds/devTim Jenßen2023-03-269-99/+99
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | bigger conflicts resolved at: src/plugins/qmldesigner/CMakeLists.txt src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
| * | cmake: Add PROPERTIES to add_qtc_testMarco Bubke2023-02-161-1/+2
| | | | | | | | | | | | | | | | | | Change-Id: I66d4437866ae2b107fede78760284dc35a1fb8f0 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-03-291-3/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp src/tools/perfparser Change-Id: Ie5643100e0eb00e0933359dce320169b876f5634
| * | Build: Fix CONDITION with multiple partsEike Ziller2023-03-231-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | for add_qtc_test and qtc_add_resources. The condition needs to be wrapped in () because otherwise conditions that contain AND or OR themselves break. Change-Id: Iff64ad15c5f5b6e5a9db5a97c975bd8854c59c02 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * | Bump version to 10.0.0Eike Ziller2023-03-171-3/+3
| | | | | | | | | | | | | | | Change-Id: I396d3d42deb825e3cd34728e38989a6ad4f09006 Reviewed-by: David Schulz <david.schulz@qt.io>
* | | Fix QtCreatorIDEBranding.cmakeAlessandro Portale2023-03-241-1/+1
| | | | | | | | | | | | | | | Change-Id: I1513058affb047c1a6483fbcd45547348d75e756 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | Bump version to 11.0.0-beta1Eike Ziller2023-03-241-3/+3
| | | | | | | | | | | | | | | Change-Id: I6f87635449be080dcc532168c0180945f4ddc02c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Build: Fix translation targetsEike Ziller2023-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter out .pro files from the translation sources. A ProjectExplorer test was added that added files like `multi-target-project-app.pro` to the target sources. lupdate then triggers a call for lupdate-pro, which in turn fails. Also filter .css files, which result in lupdate warnings. Change-Id: Ib2fa5f0228307bc5850915ed89c14a0956d1d6a8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-03-133-41/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/shared/qbs Change-Id: I33e13270c8c15a51b4ce4eaa6b4584041ed124e0
| * | Build: Simplify ts_all* targets and add "ts_all_cleaned"Eike Ziller2023-03-091-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of trying to update all files in a single lupdate call, make the ts_all targets just depend on the individual language targets. It is less efficient, but not used often, simpler to setup and since lconvert cannot work on mutliple .ts files simultanously easier to setup a ts_all_cleaned target. Change-Id: I60718408a661f011d84f3f74645e2f8fd49a95d1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | Build: Avoid installation of huge static QmlDesignerCore libraryEike Ziller2023-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not used as a public interface, just to share with tests. Do not install it. Fixes: QTCREATORBUG-28673 Change-Id: I669ffd468291b8150568d0193a33e5795d58f017 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | Bump version to 10.0.0-rc1Eike Ziller2023-03-061-3/+3
| | | | | | | | | | | | | | | Change-Id: I3aee0fbdd05a3ebc438c4ff62a43dafb6856e7a7 Reviewed-by: David Schulz <david.schulz@qt.io>
* | | CMake: Add feature info for executablesMarcus Tillmanns2023-03-121-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: I4cfa2168b6e03730c02ca089f3c6f86fc07a6a01 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-03-021-26/+8
|\ \ \ | |/ / | | | | | | Change-Id: I7bd186df0bfae7906e980e9c2c811f8dcf29750d
| * | Build: Simplify documentation target creationEike Ziller2023-03-021-26/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have to rely on qdoc being located alongside qmake anymore, because nowadays Qt defines a Qt::doc target with IMPORTED_LOCATION set, so we can use that directly. Change-Id: I450578e711e0835e00320251dcadc78c1f02ab7d Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-02-272-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/watchhandler.cpp Change-Id: If759b6260dfa008738d3a0ce543eb0eead8a8bba
| * | Cdbext: fix collecting required modules for python > 3.10David Schulz2023-02-241-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ib8f5ff953f70cfb1ad15ea29522e02d65c58cafa Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| * | MSVC: Enable exception handling for libs that use STL streamsOrgad Shaneh2023-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample warning: Building CXX object src\libs\qtcreatorcdbext\CMakeFiles\qtcreatorcdbext.dir\common.cpp.obj C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.34.31933\include\ostream(342): warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.34.31933\include\ostream(335): note: while compiling class template member function 'std::basic_ostream<char,std::char_traits<char>> &std::basic_ostream<char,std::char_traits<char>>::operator <<(unsigned long)' F:\Projects\qt-creator\qt-creator\src\libs\qtcreatorcdbext\common.cpp(20): note: see reference to function template instantiation 'std::basic_ostream<char,std::char_traits<char>> &std::basic_ostream<char,std::char_traits<char>>::operator <<(unsigned long)' being compiled C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.34.31933\include\sstream(655): note: see reference to class template instantiation 'std::basic_ostream<char,std::char_traits<char>>' being compiled Change-Id: I26508048a875aabe4c5b80ef4cccfe091a2a145e Reviewed-by: David Schulz <david.schulz@qt.io>
* | | CMake: Fix warning about fPic not being the sameMarcus Tillmanns2023-02-271-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I2a2f85c039471e2ad00551bec925cf37ca261b12 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | Build: Remove FindQt5.cmakeEike Ziller2023-02-234-107/+4
|/ / | | | | | | | | | | | | | | | | | | | | No longer needed, since we generally only support building with Qt 6 nowadays, and the parts that still do support building with Qt 5 handle that manually. Change-Id: I72381589ca3ab7bf1af88d9f185cad7f0cdf149c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Bump version to 10.0 beta2 and copyright yearEike Ziller2023-02-201-4/+4
| | | | | | | | | | Change-Id: I633df92077441d6eab1390259769488687803a9f Reviewed-by: David Schulz <david.schulz@qt.io>
* | Build: Sort contexts on translation updatesEike Ziller2023-02-201-3/+3
| | | | | | | | | | Change-Id: I484f42ff9e3d41f8830d5f531de9e4d8cdfa9c88 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Build: Add target for lupdate with obsolete, without locationsEike Ziller2023-02-171-1/+8
| | | | | | | | | | | | | | | | | | Which would be something that we can check into the repository. Change-Id: I14e3a6d5e5a505b4ae0dc4b22046834ee645ef9c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Build: Don't add QT_RESTRICTED_CAST if QT_NO_CAST is already setEike Ziller2023-01-251-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | as directory property. It is not allowed to set both, but perfparser adds QT_NO_CAST_FROM_ASCII as a directory property now. Change-Id: I6dbc8911521c737dd38c58777b8cd785e8cfe135 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | CMake build: Remove usages of Qt5_VERSIONEike Ziller2023-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | and remove checks for Qt < 6.2, since that is our minimum version. Except for sdktool and qml2puppet. Change-Id: Id36cd1a15a5a6e5480e4ae5d0a8ffaea4b2a1864 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | CMake build: Use version-less Qt targetsEike Ziller2023-01-055-19/+20
| | | | | | | | | | | | | | | | | | Since we do not support Qt < 5.15 anymore, and as a first step for getting rid of our special FindQt5.cmake. Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/9.0'Eike Ziller2022-12-201-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/texteditor/texteditor.cpp Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1
| * Bump version to 9.0.2Eike Ziller2022-12-151-2/+2
| | | | | | | | | | Change-Id: Ibc35cf8f8b388438d34c3b824c9eb97d9eefb9ea Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * CMake build: Add hint for installing libdw-dev for elfutilsEike Ziller2022-12-151-0/+2
| | | | | | | | | | | | | | | | to the CMake output when elfutils is not found Change-Id: I7ecc83ddadb0ce4bd4f8f9695cbf58443d71ff98 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Cmake: Give a hint on the use of libdw-dev for the perf parser toolshjk2022-12-151-3/+5
| | | | | | | | | | Change-Id: Ia6aed65035856250a496db41cf1ffa81590dc536 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/9.0'Orgad Shaneh2022-11-285-3/+11
|\ \ | |/ | | | | Change-Id: I231d35f492713f317773b79478b5f7fb97a4fe50
| * CMake build: Make errors of execute_process fail the buildTim Jenssen2022-11-285-3/+11
| | | | | | | | | | | | | | | | | | | | | | Instead of silenty failing and resulting in broken builds/packages. The property is only available since CMake 3.19, so limit the feature to that. Change-Id: I82b06e78540e81a809f7fdfe130648becfc9672e Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * Bump version to 9.0.1Eike Ziller2022-11-241-2/+2
| | | | | | | | | | Change-Id: Iaa42623df5a1b35833cb1f9e0cfc3187b580e34b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 9.0.0Eike Ziller2022-11-111-3/+3
| | | | | | | | | | Change-Id: I9975d78fc4d9f263702e7f031083ab4847269fc3 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/9.0'Eike Ziller2022-11-101-6/+17
|\ \ | |/ | | | | Change-Id: Ie069f3b2a1200b3e665341b1d56ce836024b0d29
| * CMake/translations: Use lconvert for cleaning ts filesEike Ziller2022-11-091-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the translation process it is nice to keep obsolete items and locations, but we do not want these submitted in the end. So while translating we'd have patches: 1. lupdate cleaned of obsolete and line numbers 2. wip: lupdate with obsolete and line numbers 3. translation of plugin X 4. translation of plugin Y and before submitting we want to remove the wip patch (2). But, running lupdate with "-no-obsolete -locations none" for cleaning the ts file has a slightly different sorting than without it, which leads to conflicts when removing the wip patch (2). Instead run lupdate with obsolete items and line numbers first, and clean the ts file with lconvert afterwards. That keeps the diff between patch (1) and (2) minimal, and results in a clean rebase process when removing patch (2). Change-Id: I3b8ac7c30dc6eb0e501be765eb6e64069007a5bd Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Merge remote-tracking branch 'origin/9.0'Eike Ziller2022-11-031-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399
| * Translations: Add targets that update translations without the cruftEike Ziller2022-10-311-0/+7
| | | | | | | | | | | | | | | | | | | | Without obsolete and vanished translations, and files and line numbers. Which is what we would in the end submit into the repository. run with `cmake --build . --target ts_<lang>_cleaned` Change-Id: If5b73f19d8fc7b49bcf95fbeb0b0ff7793056cca Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 9.0.0-rc1David Schulz2022-10-261-3/+3
| | | | | | | | | | Change-Id: If9f046539e70e8aba9af367472b76bac853198b8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Bump version to 9.0.0-beta2Eike Ziller2022-10-131-3/+3
| | | | | | | | | | | | Change-Id: I2ad221b1f6eef849220de2870ac2219e5c008279 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Merge remote-tracking branch 'origin/9.0'Eike Ziller2022-10-101-4/+10
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/qmldesigner/CMakeLists.txt Change-Id: I500420df35519e6903abc570d1283185f01bf900
| * build.py: Add option to call cpackEike Ziller2022-10-071-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Adds --with-cpack option. - macOS: does nothing (we already create a better, signed disk image) - Linux: creates qtcreator.deb in build directory - Windows: Checks for NSIS and WIX installation, creates qtcreator.exe and qtcreator.msi as appropriate Change-Id: Ie7816d04cb2e01e90795481e1519b0a6645f5cd3 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Bump version to 10.0.0-beta1Eike Ziller2022-10-051-3/+3
|/ | | | | Change-Id: Ieb90096775fecfb4bfe1228372a1a3b0d9512faf Reviewed-by: David Schulz <david.schulz@qt.io>
View Lorry Controller Status