Commit Graph

469 Commits

Author SHA1 Message Date
Eike Ziller
0795a5ae6f Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
2020-02-07 10:41:09 +01:00
Cristian Adam
a5178afb61 CMake Deployment: Move creation of qt.conf to add_qtc_executable
Change-Id: Icbeed128cc99b077aad925f278aaf9534d3f9fec
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-06 18:19:50 +00:00
Cristian Adam
8d767a3a21 CMake Deployment: Remove Dependencies component
- 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>
2020-02-06 18:03:33 +00:00
Cristian Adam
decb6866b9 CMake Deployment: Fix deployment / rpath handing on Linux
Change-Id: Ic8eb8665e4ac43a49ecbf07f2a92873453c9faca
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-06 17:34:01 +00:00
Eike Ziller
ca42bf7696 Bump version to 4.11.2 and copyright year to 2020
Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 11:41:42 +00:00
Cristian Adam
ba2a23834c CMake Build: Brought back GoogleTest unittest
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>
2020-01-31 16:08:52 +00:00
Cristian Adam
1fac0d49a2 CMake Build: Add include guards for QtCreatorAPI
Commit e8fceb821e re-includes the file,
and things go bad.

Change-Id: Ifad79824f1a64459cd01337656b1a1300f49d06b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-31 12:59:07 +00:00
Cristian Adam
b3caf501ce CMake Build: Add Dependencies install target
Change-Id: I17f8d26500a9a75bef64e23c3b64492c1bb929cc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-30 18:03:28 +00:00
Alessandro Portale
4d213bf5e0 CMake: Fix DesignerComponent detection for MSCV/debug
Change-Id: Ia5e7a26891f062d040dcfd9a395c5e1b4cbaf321
Hack: Also search for "d" versions of the library.
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-28 15:20:21 +00:00
Cristian Adam
48de5294c7 CMake Build: set a 5s timeout per test
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>
2020-01-28 14:18:27 +00:00
Cristian Adam
e6e0b0ca3b CMake Build: add perfparser
Change-Id: Ib16548befefbb827f2752300f9e67da3cf91570c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-28 14:18:19 +00:00
Alessandro Portale
28ce199217 Core: Let the clickable link in VersionDialog jump to git log
...instead to just one commit.

Change-Id: I8bb53ba3e7f4fcfb2fb306afe2a06a2b63dc89d8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-24 17:20:05 +00:00
Alessandro Portale
0d991985d6 Core: Fix non-CMake compilation with IDE_REVISION
amends ae9fbd04dd

Change-Id: I746a89b21ee07aecad525b7b91fe1f360ad1e853
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-24 13:44:52 +00:00
Eike Ziller
bc4fd14ee4 CMake build: Some clean up for macOS
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>
2020-01-24 11:43:27 +00:00
Alessandro Portale
ae9fbd04dd Core: Make the revision sha in VersionDialog a clickable link
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>
2020-01-23 14:33:31 +00:00
Alessandro Portale
aac0f2a8f5 CMake build system: Fix skipping tests with unmet dependencies
Handle google tests
amends: I0eadf5

Change-Id: I02837e2e3edcb7f4d9ae07991e2e311226c37a28
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-16 18:05:55 +00:00
Alessandro Portale
048f0f63c9 CMake build system: Skip building tests with unmet dependencies
Change-Id: I0eadf5a8d2c98486d2d8aabfe835f5ab0dbc9190
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-16 17:02:46 +00:00
Cristian Adam
ec5c626d15 CMake Build: do not set .dll extension for static libraries on Windows
Change-Id: Ic0cd8958641577164e7291f103dbd571fb0024cb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-15 16:06:29 +00:00
Eike Ziller
1c37415604 Merge remote-tracking branch 'origin/4.11'
Change-Id: Ib47833b23e90c5f08b318d3d4985a4f3a450ee4b
2020-01-15 07:21:52 +01:00
Cristian Adam
91d50d4d46 CMake Build: match qmake naming scheme on Windows
Plugin4.dll and Library4.dll

Change-Id: Ifec8c04f4f0f2ee4315d31db288379fad2b41d48
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-14 17:36:46 +00:00
Eike Ziller
c22a840b10 CMake build: Fix version number in library file names
Make it compatible with the qmake build, with just the major version.

Change-Id: I3134b21b4775e7e83d135652dd66a51f3bdf91ab
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-14 15:39:10 +00:00
Eike Ziller
0d005b7057 Version bump to 4.11.1
Change-Id: I31c53f92acd02c380e44ecea534b178a3fb5458c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-16 12:20:53 +00:00
Orgad Shaneh
49f6b0146a Merge remote-tracking branch 'origin/4.11'
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
2019-12-07 18:39:54 +02:00
Eike Ziller
76c54f5201 Update version to 4.12 beta
Change-Id: I13641e62b01b126493be852e5db3ef76044918f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-06 10:22:52 +00:00
Cristian Adam
ba31c5d554 CMake Build: do not fail to install on missing targets
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>
2019-12-03 15:00:37 +00:00
Eike Ziller
50fad4f0f9 Bump version to 4.11.0
Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-29 13:43:54 +00:00
Eike Ziller
646c7860cb Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/genericprojectmanager/genericprojectplugin.cpp
	src/plugins/projectexplorer/environmentaspect.cpp
	src/plugins/projectexplorer/environmentaspect.h
	src/plugins/projectexplorer/environmentaspectwidget.cpp

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
2019-11-11 12:58:11 +01:00
Cristian Adam
eebf36adc7 CMake: Make sure that explicit plugin.h files depend on the json file
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>
2019-11-07 14:15:46 +00:00
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
04f0123c43 Merge remote-tracking branch 'origin/4.11'
Change-Id: Ie951c531a5b2efd8e6b972c4d04b7f1c681c8ef9
2019-11-04 14:41:36 +01: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
Cristian Adam
6c25049019 Windows: Remove explicit usage of _WIN32_WINNT and WINVER macros
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>
2019-10-31 11:45:20 +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