Commit Graph

267 Commits

Author SHA1 Message Date
Cristian Adam
3f0a54d41c CMake: Add option to link with Qt
The named option is BUILD_LINK_WITH_QT, which when set to ON will
generate the QtCreator.ini file needed for Qt Creator to find the
installed Qt.

Change-Id: If3a47a463510fbfc90a314829378c6c4e505d2f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-15 14:26:27 +00:00
Eike Ziller
3d4d7c7e14 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
2021-09-13 17:03:55 +02:00
Cristian Adam
be2466dfa7 CMake: Remove major version number dll suffix
This was done to have qmake parity when we compared the qmake and cmake
release builds.

Since we are past that now, and the cmake build is the one used to do
releases, we can drop the number from the dlls.

Change-Id: I60d1b368daf4258884c239204c2e3c18f244e930
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-10 12:43:19 +00:00
Eike Ziller
6528bd6a27 Add branding option for application icon and logo
Change-Id: I23ee91ab47d06aab370b2083d4f96f7833bf16ff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-08 06:29:51 +00:00
Eike Ziller
28f1519182 Bump version to 5.0.1
Change-Id: Ic4daa60f1cb55a15a6885292cf2928910ae3f563
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-27 12:26:49 +00:00
Eike Ziller
b09b6bd747 Merge remote-tracking branch 'origin/5.0'
Change-Id: I370268624bd6e91e7b44fa236e913f5f55867e17
2021-08-20 09:50:30 +02:00
Eike Ziller
3611fb1065 macOS: Exclude CMAKE_PREFIX_PATH when searching for dsymutil
dsymutil is shipped with libclang, but we usually don't want to use that.
Fixes universal builds while we don't have a universal build of libclang yet.

Change-Id: Ie5c435e1c391f7bb0a8f1faadbb7b3375d101990
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-08-19 14:00:33 +00:00
Eike Ziller
94d352ab28 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/plugins/autotest/testresultdelegate.cpp

Change-Id: If172206f231fc2a9f4a672cd2e6eaeaea4988c96
2021-08-18 16:14:24 +02:00
Orgad Shaneh
2384865bff UnitTest: Adapt to Google Benchmark v1.5.4
Change-Id: I2c2a34206dbc01d277242f5d736eef3e1333b01f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-08-18 11:58:46 +00:00
Eike Ziller
1dd0511b49 Bump version to 5.0.0
Change-Id: I1203dd71cc2f1e6d1f435dbfdc07376130fbb61f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-13 07:25:12 +00:00
Eike Ziller
c7168d1063 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/plugins/coreplugin/locator/executefilter.cpp

Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
2021-08-11 10:10:51 +02:00
Eike Ziller
0b7cd967a2 CMake build: Fix pdb file names (Windows)
They should have the same base name as the DLL/.lib, but were missing
the version number.

Fixes: QTCREATORBUG-25968
Change-Id: I30e39a62b94264bd5a4852f0b1100044fa47d811
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-08-10 12:23:16 +00:00
Cristian Adam
dbdea46f66 Unittest: Allow standalone tests build without libclang
Without libclang, or for the MSVC case when libclang has been built
with a different CRT. (release vs debug)

Change-Id: Ia1c5adbd1f9126efb95f1517c8ff274b5919c10e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-07-28 15:28:41 +00:00
Eike Ziller
67d85d1592 Bump version to 5.0 RC1
Skipping Beta 2 due to summer slothfulness.

Change-Id: If3ee6c1c218b17d413d2f28023b9fb094a969cdd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-16 09:31:23 +00:00
Eike Ziller
f08bd9df91 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Iba1e6cacaebf9bb4653ac77e981ddacaf729c52c
2021-07-14 12:20:35 +02:00
Eike Ziller
40e87880fd CMake: Make it possible to run ts_* targets with Qt 6
Alias for lupdate for missing

Change-Id: I8a9a68e6d3be54ab8e1d143d3611e9d8da6d760d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-14 10:15:54 +00:00
Eike Ziller
f6290d52f5 Bump version to 5.0 beta2
Change-Id: Ie8a9f5be343d5aa939b9ec54e549c604d05d223f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-12 09:41:54 +00:00
Eike Ziller
f16276c792 Merge remote-tracking branch 'origin/5.0'
Change-Id: I368fffe959c10f5942ccb1bcdb1fed4ac1a7460b
2021-07-08 11:16:06 +02:00
Eike Ziller
cd84331848 CMake build: Fix workaround for new *Private targets with CMake < 3.18
Amends a803d04c17

Change-Id: I2df067d988a79845f4a9f85485c13e5e2f8019dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 14:07:06 +00:00
Eike Ziller
1d05a2b5af Merge remote-tracking branch 'origin/5.0'
Change-Id: Icea9215204a7247c5fbbc818833132676a3b9e11
2021-07-06 16:00:14 +02:00
Orgad Shaneh
dcf692d3ff CMake build: Purge copying settings from Nokia directory
It is not used, and not supported in the other build systems.

Change-Id: I38049e145595490058e255b94cdb8dd13c3f6fb2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-05 14:36:25 +00:00
Eike Ziller
dbb5ab932c CMake build: Don't re-link libraries unnecessarily
If a library changes its implementation only, don't relink all
libraries that depend on it. This is usually not necessary since the
API stayed the same.

Fixes: QTCREATORBUG-25962
Change-Id: I0221b09afd92463c3dad40bd0107ba0d5668ac79
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-05 13:23:01 +00:00
Orgad Shaneh
84839ee397 Merge remote-tracking branch 'origin/5.0'
Change-Id: Ia018600fb257c9523fc9d15faa5bd8300840e3de
2021-07-05 12:17:45 +03:00
Cristian Adam
4c07f10d33 CMake: Fix compilation build with older CMake versions
Change-Id: I86dbff49cf5d00bf75d2e32154db2d3d254e2b17
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-29 11:17:49 +00:00
Eike Ziller
2bfcc3739f Bump version to 6.0 beta
Change-Id: I945c2bc0f400191efdfd37523a66ffedee0deb09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-29 11:06:38 +00:00
Cristian Adam
f8a77287bf CMakePM: Add support for qtc_runnable feature
This will allow for the Qt Creator's CMake build only qtcreator
target to be selected as runnable.

Similar to qmake's qtc_runnable or Qbs's qtcRunnable features.

Fixes: QTCREATORBUG-25908
Change-Id: I6416873d0ad9cfec4960d98fc4b289ec98cc58b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-25 14:24:41 +00:00
Eike Ziller
6bc9cddb9e Merge remote-tracking branch 'origin/4.15' into 5.0
Conflicts:
	src/plugins/cmakeprojectmanager/projecttreehelper.cpp
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee
2021-06-24 10:43:10 +02:00
Tim Jenssen
a803d04c17 fix Qt6.2 builds
use foreach to be prepared for the future

Change-Id: I9157bb04479ff2376a567380c76c38b9aee900b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-22 13:02:11 +00:00
Eike Ziller
4290c26414 CMake build: Force optimization of CPlusPlus lib
Even in the debug build, as done for the qmake build system. This is for
performance optimization of this critical part for C++ parsing even in
debug / developer builds.

Change-Id: I9552ba9fc44e213f2df1d2d2a64a126af3603fd1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-22 10:10:14 +00:00
Eike Ziller
c29d4e09a2 CMake build/Qt6.2: Avoid message about missing DesignerComponents
Amends 77fd87a545

Change-Id: I237a3f0b146f9fe5e2db1e1e4eb943a90fbd8db8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-18 14:07:35 +00:00
Tim Jenssen
77fd87a545 fix Qt 6.2 build
Change-Id: I426879c9ac8e1db84a39789d00e73498216e089c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-17 17:07:42 +00:00
Eike Ziller
487e4a2e51 unittest: Add missing tests (QmlDesigner, ClangTools and a few others)
Ups it to 2487 tests from 110 test suites.
(from 1963 tests from 91 test suites)

Change-Id: Id601bc8bbd43f129956be812e30a94081098c3cb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-06-17 14:44:20 +00:00
Eike Ziller
905f5d4e1b Merge remote-tracking branch 'origin/4.15'
Conflicts:
	coin/instructions/common_environment.yaml

Change-Id: I2084c24f7e052b9647b30f810207b3c8beecce3c
2021-06-16 11:48:08 +02:00
Tim Blechmann
8ec23e44a2 cmake: fix Qt6Core5Compat detection
Change-Id: I6de4de1f20b4e611f632ee515cfdf5243f2d16ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-16 07:05:16 +00:00
Cristian Adam
aef432ec13 CMake: Add BUILD_TESTS CMake variable to filter tests to build
This allows building one test: -DBUILD_TESTS=tst_my_test, this will set
BUILD_TESTS_BY_DEFAULT to OFF (default value is ON) and set
BUILD_TEST_TST_MY_TEST to ON.

Change-Id: I7800f3d238121725bb9fa4146f76ddcd2b10bde9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-11 13:40:24 +00:00
Eike Ziller
dcfc467959 Revert "CMakePM: Filter test also by BUILD_EXECUTABLES list"
This reverts commit 99396421de.

The patch does not solve the use case (building Qt Creator without
tests and then only building individual tests), and has lots of
side effects like tests landing in the application bundle on macOS
and in bin on Windows, and tests being installed.

Change-Id: I593627b55577e13a3d2cf1758deac99efa521954
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-11 11:49:08 +00:00
Cristian Adam
99396421de CMakePM: Filter test also by BUILD_EXECUTABLES list
This way one can build only one test.

Change-Id: Iebf9686108988793193106ebed312f7e86ee2e61
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-06-10 16:47:44 +00:00
Cristian Adam
d542c81f81 CMakePM: Only build unittests if clang package is found
If the clangTooling target is present then QTC_CLANG_BUILDMODE_MATCH
will be set to ON.

If QTC_CLANG_BUILDMODE_MATCH is OFF then unittest will not be build.

Change-Id: Ifacbec82734efa58cc8d7c680bd1ac957cac2dc6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-06-10 13:57:05 +00:00
Eike Ziller
b423523852 Bump version to 4.15.2
Change-Id: Ida5406673616350ad6656533de179342ab320171
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-10 07:07:43 +00:00
Eike Ziller
8650e42be8 Merge remote-tracking branch 'origin/4.15'
Change-Id: I07ac7113947cae2e7c3e51b8fa95563fe02b3dc8
2021-06-09 09:03:41 +02:00
Eike Ziller
6e9acfe08e CMake build: Add files from qtc_copy_to_builddir to tree
Make the files from qtc_copy_to_builddir part of the project tree, so
they get included in searches etc.

Change-Id: I191f88c8520b9e4a16fd6a5acfeda9cf880cea89
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-07 08:04:14 +00:00
Eike Ziller
57f889feb5 CMake build: Fix extend_qtc_test
extend_qtc_test should gracefully do nothing if the test was declared,
but disabled for any reason.

add_qtc_test failed to add the test to the list of declared tests, if
dependencies were missing, so extend_qtc_test was complaining that the
test didn't exist in that case.

add_qtc_test must always add the test to the list of declared tests, and
extend_qtc_test must only fail if the test was never declared, but do
nothing if the test target does not exist (because the test was disabled
for some reason).

Change-Id: I414a169e3e23c3c0e11c11e2ee86effa706b545c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-28 08:34:21 +00:00
Alessandro Portale
588af658ee CMake build system: Fix error message in extend_qtc_test
Print out "${target_name}"

Change-Id: I6978856bfe010cdfc934260db1a3490a1329eb6a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-27 21:35:14 +00:00
Eike Ziller
0b0226b112 CMake build: Gracefully handle turned off target in qtc_add_resources
Otherwise qtc_add_resources fails when turning off corresponding
BUILD_.... flags, or needs to be wrapped with "if(TARGET ...)" everywhere.

Change-Id: I34e230569ab9619b1c107404bf2fdf8e8e86bd7e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-26 11:24:29 +00:00
Eike Ziller
dbd4a10d6f Merge remote-tracking branch 'origin/4.15'
Change-Id: I3d3dfa04124eed14952294c2847b9851dcb1a5fd
2021-05-25 16:26:54 +02:00
Cristian Adam
9449bfbf04 CMake: Fix build with MSVC 2019 and Qt 6.2
Qt 6.2 requires __cplusplus preprocessor set to at least 201703L

According to https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus
one needs to add the compiler flag /Zc:__cplusplus

CMake doesn't set the flag, there is an issue opened at
https://gitlab.kitware.com/cmake/cmake/-/issues/18837

This flag is passed to any target that links to Qt6::Core, unless
the flags are not manually copied for some reason.

Task-number: QTCREATORBUG-25730
Change-Id: I271e85fe857b5d4ac8980f77c723e5704a8eb743
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-21 14:02:33 +00:00
Eike Ziller
759e15dbb4 CMake build: put .lib files next to .dll files for libraries
- there is no reason for putting them elsewhere
- since CMake file-api only reports the .lib location for linked
  libraries, Qt Creator has difficulties with adding the correct
  PATH for running e.g. manual tests, when the .lib files are at
  an arbitrary location

Fixes: QTCREATORBUG-25684
Change-Id: I24b26a79c70fd5384f534f8f0b66b51fca1ecc56
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-20 10:03:11 +00:00
Eike Ziller
b66a403f36 Enhance qtc_add_resources with CONDITION
like most other functions

Amends 201786d3fc

Change-Id: Id35b9730dd6c9b55e80b99068a8ec98d30538705
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-11 10:02:14 +00:00
Eike Ziller
f4c3c49920 Bump version to 4.15.1
Change-Id: Ibc2b495f00d33ec9c0c1400c9378cd80d95e11f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-05 14:48:35 +00:00
Eike Ziller
b3a893e9b8 Merge remote-tracking branch 'origin/4.15'
Change-Id: I75ffc79eeb8d73296a2271a636fae48e35427947
2021-05-05 11:46:19 +02:00