summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Handle translationsTobias Hunger2019-09-171-5/+48
| | | | | | | | | | | | | | | | | (Optionally) re-generate .ts files from CMake by running lupdate and run lrelease to generate .qm files. Changes to qmake: * src/libs/3rdparty/syntax-highlighting/src/cli/kate-syntax-highlighter.cpp is no longer translated: It's a command line tool that is not used by creator * src/libs/aggregation/examples/text/main.cpp is no longer included in ts files * src/libs/qt-breakpad/qtcrashhandler/* is no longer included in ts files: It is not built right now Change-Id: Iec018da86a111a68ec983a880cef2961b48ccdf9 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-09-121-1/+0
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
| * Bump versionEike Ziller2019-09-091-2/+2
| | | | | | | | | | Change-Id: Id326cb47ae86be52016850455eeac20a6fcfc4a0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake Build: Fix include directory for external yaml-cppCristian Adam2019-09-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | On Linux one gets: /usr/lib/x86_64-linux-gnu/cmake/yaml-cpp/../../../../include which fails to compile. Resolve the path so CMake can detect/remove the duplicate to fix this. Change-Id: I4987c8edd99e60d31beb2d5075a949090996bc3a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | CMake Build: Use same Qt compiler defines for testsCristian Adam2019-09-101-0/+13
| | | | | | | | | | | | | | Source code needed adjustments though. Change-Id: I78b4610a6bb895a385c7c30a6c92c97a276b89dd Reviewed-by: hjk <hjk@qt.io>
* | CMake Build: Fix finding link library for DesignerComponentsCristian Adam2019-09-101-1/+1
| | | | | | | | | | | | | | | | On Windows the find_library call was finding the .dll file, and not the .lib or .dll.a link library. Change-Id: Ic20845f9ef4c77e0ae8c3ca3476a12fc1b45ef36 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ClangTools/cmake build: Fix build against external yaml-cppEike Ziller2019-09-101-2/+4
| | | | | | | | | | | | | | | | For some reason that doesn't set INTERFACE include directories, so do it manually. Change-Id: I3451252ff8c0651dc1dd13c8ffa7c0e3c952e732 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | ClangTools: Support loading exported diagnosticsNikolai Kosjar2019-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | Add a new toolbar button to load diagnostics exported with $ clang-tidy -export-fixes=/path/to/file $ clazy-standalone -export-fixes=/path/to/file (master version) Change-Id: I8316fe0706a18222e68220ef4fbfdc7ae8d09804 Reviewed-by: David Schulz <david.schulz@qt.io>
* | CMake build: Add some more feature infoEike Ziller2019-09-031-5/+15
| | | | | | | | | | | | | | | | About script Locator filter and helpviewer backends Change-Id: If371ff824d16715f16ec9b245f42efe0d506c665 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Import YAML-Parser yaml-cppNikolai Kosjar2019-08-302-1/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version: tags/yaml-cpp-0.6.2 License: MIT yaml-cpp requires c++11 and since yaml-cpp 0.6 there is no dependency on boost anymore. A YAML parser is needed for the ClangTools plugin to parse exported diagnostics from clang-tidy/clazy: $ clang-tidy -export-fixes=/tmp/tidy.yaml source.cpp The imported source is stripped of unneeded files as documented with src/libs/3rdparty/yaml-cpp/patches/0001-yaml-cpp-Strip-unneeded-sources.patch (generated with "git format-patch -D") Change-Id: Ib0a521b5aff4b1cd058eb480bfb99fde4b320dc7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-08-221-7/+18
|\ \ | |/ | | | | | | | | | | Conflicts: src/libs/utils/consoleprocess_win.cpp Change-Id: Ibdc265eed2f7080726e11ff6f2931c8559943af2
| * CMake build: Make it possible to put plugins into Qt Creator buildEike Ziller2019-08-191-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | In the super repository builds we want all plugins to end up at a single place, so running the build result includes all plugins, even without an explicit install. With this patch we can set QTC_MERGE_BINARY_DIR in the super CMakeLists.txt to achieve that. Change-Id: I8b590e5a521a06aa5a8f00ef0e60f5c3b4349ee2 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-08-151-0/+49
|\ \ | |/ | | | | Change-Id: I4d24269ef040c45e2143dfa86d1be3f7e8008521
| * CMake build: Build with PCHCristian Adam2019-08-141-0/+49
| | | | | | | | | | | | | | This commit enables building with upstream CMake PCH support. Change-Id: Ib37745b00e7560e804483e7c2c2a3fa7cf6d663c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version -> 4.10.0Eike Ziller2019-08-051-3/+3
| | | | | | | | | | Change-Id: I2f5dfc47978514a6377db63705a703ce16f20499 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMakeLists: Allow for internal plugin registrationTobias Hunger2019-08-091-3/+9
| | | | | | | | | | | | | | | | | | | | add_qtc_plugin now takes a flag "INTERNAL_ONLY". These internal plugins will not show up in the project configuration nor in the feature summary. This flag is used by the tests that build plugins. Change-Id: I1912dd62221b2624ed7326df381fbbceccefbdac Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-08-011-3/+7
|\ \ | |/ | | | | Change-Id: Id9cab641788f93cda9a81da9f156614b91d87b2a
| * CMake build: Add PUBLIC_DEFINES to extend_qtc_target/add_qtc_pluginEike Ziller2019-08-011-3/+7
| | | | | | | | | | | | Change-Id: I65d5af13f697ed7dcf4d3584e3b4cd776dcdf6c0 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-07-263-0/+716
|\ \ | |/ | | | | Change-Id: I427280fdb207b878000697dfd37595ffdb26f4e7
| * CMake build: Add "Devel" packageCristian Adam2019-07-253-0/+716
| | | | | | | | | | | | | | | | | | The "Devel" package will contain headers, libraries, documentation needed by the 3rd parties to build Qt Creator plugins. Fixes: QTCREATORBUG-22514 Change-Id: If54929f823982b921b98a63ff6085d53618a3a49 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Tim Jenssen2019-07-041-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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
| * Bump version to 4.10.0-rc1Eike Ziller2019-06-281-3/+3
|/ | | | | Change-Id: I95991a4f46be2f2bc1600ca38d14b9b03269fc0b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Allow brandingEike Ziller2019-06-211-0/+14
| | | | | | | | | | Create your own QtCreatorIDEBranding.cmake somewhere and point cmake to it via CMAKE_MODULE_PATH Task-number: QTCREATORBUG-22488 Change-Id: Ic1057d879c5104b57e4ed8ef8a9c4fc8d4140de9 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Add unittest CMake build filesCristian Adam2019-05-292-0/+184
| | | | | | | | | On MinGW 8.1 I get the following after running ctest -j 40 99% tests passed, 35 tests failed out of 2631 Change-Id: I2c3ce7940b036e52ef393feab5837886355e7b5a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake build / macOS: Find QtDesignerComponents frameworkEike Ziller2019-05-201-6/+24
| | | | | | | | Enables building of Widget Designer integration on macOS Change-Id: I84a2ee78ccf99941a0be517e089ece810154699d Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Qt Creator CMake portCristian Adam2019-05-172-0/+106
Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
View Lorry Controller Status