Commit Graph

39 Commits

Author SHA1 Message Date
Eike Ziller
4843216192 macOS: Fix execution of helper executables with UI
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>
2019-11-05 12:31:40 +00:00
Eike Ziller
715db5ada8 Bump version -> 4.11.0-rc1
Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-04 11:59:19 +00:00
Tobias Hunger
b128d498b2 CMake Buildsystem: Enable visibility settings for binaries
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>
2019-10-21 11:20:14 +00:00
Eike Ziller
163faba8ff Bump version -> 4.11 beta2
Change-Id: Iea7b87cc19309eb4c3a921fa29d1b40170aaacc8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-21 08:45:26 +00:00
Tobias Hunger
a28f57abb9 CMake BuildSystem: Fix visibility handling for PCH
Change-Id: Ib91f03cf4f13ddefe365cf1e59cc083d700f0672
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-10-16 08:44:47 +00:00
Cristian Adam
d769db2c78 CMake Build: Enable PCH build with the latest CMake version
The almost 3.16 CMake version has support for C and C++ PCHs.
The library that creates the shared PCHs needs to have also
a dummy C file.

Change-Id: Ifc9e2ae43522dd5fda5261e938901f6a8ad1898c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-10-09 15:52:08 +00:00
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
7651ba50fc CMake Build: Add IDE_COPYRIGHT_YEAR
The About dialog was looking weird: "Copyright 2008 - "

Change-Id: I74b7117f6abce831adc3fd66042b777dbcfd1b67
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-04 10:18:18 +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
Eike Ziller
8df0653bf8 Merge remote-tracking branch 'origin/4.10'
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
2019-09-12 09:08:04 +02:00
Cristian Adam
24da5b14d4 CMake Build: Fix include directory for external yaml-cpp
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>
2019-09-11 06:11:21 +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
Cristian Adam
3bb0ad62e2 CMake Build: Fix finding link library for DesignerComponents
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>
2019-09-10 12:21:57 +00:00
Eike Ziller
b9a0c3ce99 ClangTools/cmake build: Fix build against external yaml-cpp
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>
2019-09-10 08:07:05 +00:00
Eike Ziller
f1e3484cd7 Bump version
Change-Id: Id326cb47ae86be52016850455eeac20a6fcfc4a0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-09 08:57:03 +00:00
Nikolai Kosjar
e6d16b6747 ClangTools: Support loading exported diagnostics
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>
2019-09-03 09:39:48 +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
652a84e14a Bump version -> 4.10.0
Change-Id: I2f5dfc47978514a6377db63705a703ce16f20499
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-05 07:00:49 +00:00
Eike Ziller
e5543eaebf Merge remote-tracking branch 'origin/4.10'
Change-Id: Id9cab641788f93cda9a81da9f156614b91d87b2a
2019-08-01 11:58:56 +02: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
Eike Ziller
3ab3e68a7b Merge remote-tracking branch 'origin/4.10'
Change-Id: I427280fdb207b878000697dfd37595ffdb26f4e7
2019-07-26 10:30:03 +02: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
Tim Jenssen
1df6443d4a Merge remote-tracking branch 'origin/4.10'
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
2019-07-04 15:17:55 +02:00
Eike Ziller
b3de8fc809 Bump version to 4.10.0-rc1
Change-Id: I95991a4f46be2f2bc1600ca38d14b9b03269fc0b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-28 11:05:00 +00:00
Eike Ziller
f4acc2f162 CMake build: Allow branding
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>
2019-06-21 13:30:04 +00:00
Cristian Adam
f50859e856 CMake build: Add unittest CMake build files
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>
2019-05-29 13:46:25 +00:00
Eike Ziller
f498f577e6 CMake build / macOS: Find QtDesignerComponents framework
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>
2019-05-20 11:30:52 +00:00
Cristian Adam
d855b84c5d Qt Creator CMake port
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>
2019-05-17 13:33:28 +00:00