Commit Graph

17 Commits

Author SHA1 Message Date
Cristian Adam
87023db572 CMake Build: Properly build qtcreatorcdbext
Change-Id: I8b4a58d79124debd877442fe23798c77bff723c5
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 13:26:53 +00:00
Cristian Adam
f88ad0e9d0 CMake Build: Allow building with Qt5 and Qt6
Emulate Qt5's functions/targets with Qt6 equivalents.

Change-Id: I6bfc5c8a649f0ddc5f1117bc5b2d0f41cb72c821
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-24 16:05:23 +00:00
Orgad Shaneh
06b95a0269 CMake: Fix typo
This amends commit 4a20a596c8.

Change-Id: I67ef326c54702162ad56136e66c2f66bb407343e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-09-20 08:48:31 +00:00
Eike Ziller
8354d426de CMake build: Fix additional feature info
They were always printed as enabled, because the
condition is not evaluated within add_feature_info

Change-Id: I9e50648d037aebecdb895d4ce5f4de7c1fee3ead
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-20 06:07:13 +00:00
Cristian Adam
4a20a596c8 CMake Build: Use shared precompile headers
This will make the build directory size smaller, as only two
pch files will be generated. Not one for every target.

Change-Id: I3eec91e7536eab1c62bff8843f075f0ef7b5fff6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-09-19 11:38:34 +00:00
Cristian Adam
f275a1fa28 CMake Build: Fix CMake configuration when BUILD_WITH_TESTS=ON
The GMock/GTest unittest was not working with the latest translation
patches.

Change-Id: I83e337c6278cb93344c734c05d090a65def34a3b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-09-19 09:55:30 +00:00
Tobias Hunger
c3f31b6332 CMake: Handle translations
(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>
2019-09-17 12:37:14 +00:00
Cristian Adam
486aaabd21 CMake Build: Use same Qt compiler defines for tests
Source code needed adjustments though.

Change-Id: I78b4610a6bb895a385c7c30a6c92c97a276b89dd
Reviewed-by: hjk <hjk@qt.io>
2019-09-10 15:05:59 +00:00
Eike Ziller
d9d18ee393 CMake build: Add some more feature info
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>
2019-09-03 07:05:27 +00:00
Nikolai Kosjar
0ba729e527 Import YAML-Parser yaml-cpp
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>
2019-08-30 08:42:22 +00:00
Eike Ziller
30143478f3 Merge remote-tracking branch 'origin/4.10'
Conflicts:
	src/libs/utils/consoleprocess_win.cpp

Change-Id: Ibdc265eed2f7080726e11ff6f2931c8559943af2
2019-08-22 09:53:37 +02:00
Eike Ziller
a1d48830b1 CMake build: Make it possible to put plugins into Qt Creator build
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>
2019-08-19 12:11:10 +00:00
Eike Ziller
8201d49ea0 Merge remote-tracking branch 'origin/4.10'
Change-Id: I4d24269ef040c45e2143dfa86d1be3f7e8008521
2019-08-15 08:57:27 +02:00
Cristian Adam
ab9aae4856 CMake build: Build with PCH
This commit enables building with upstream CMake PCH support.

Change-Id: Ib37745b00e7560e804483e7c2c2a3fa7cf6d663c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-14 13:40:48 +00:00
Tobias Hunger
1e9ee0ce1d CMakeLists: Allow for internal plugin registration
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>
2019-08-09 09:05:54 +00:00
Eike Ziller
100e21c0d4 CMake build: Add PUBLIC_DEFINES to extend_qtc_target/add_qtc_plugin
Change-Id: I65d5af13f697ed7dcf4d3584e3b4cd776dcdf6c0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-01 09:50:19 +00:00
Cristian Adam
8ae9cfe39d CMake build: Add "Devel" package
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>
2019-07-25 14:06:46 +00:00