Commit Graph

88 Commits

Author SHA1 Message Date
Tim Jenssen
4e5498051b QmlDesigner: increase necessary Qt version to 6.5.4
Change-Id: Ib276421fb5e8c7ca55b382fc4ade0281c9f73e7c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-24 15:31:11 +00:00
Thomas Hartmann
1f4d1a5820 QmlDesigner: Use different changelog path for QDS
* Do not deploy Qt Creator changelog for Qt Design Studio
* Set minimum size on combo box

Change-Id: Ic069c76b5a02963972ec199553ce9e27c820f75a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-04-16 13:58:47 +00:00
hjk
b7b78df8be Require C++20
Prevent introducing C++20 problems for the master merge.

Change-Id: Id6581a4c32ec6411195edb51339f017e4ddb51ff
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit e678da9934)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 12:09:37 +00:00
Tim Jenssen
0416941fd1 CMake: introduce option BUILD_DESIGNSTUDIO
This change needs an update of the super repository

If you want to buid QtDesignStudio documentation no branding path
is necessary anymore:

cmake -DCMAKE_GENERATOR:STRING=Ninja -DWITH_DOCS=ON -DCMAKE_PREFIX_PATH:PATH=C:\Qt_online\6.5.3\msvc2019_64 -DBUILD_DESIGNSTUDIO=ON C:/dev/tqtc-qtc-super/qtcreator
cmake --build . --target html_docs

Task-number: QDS-9827
Task-number: QTCREATORBUG-24222
Change-Id: Ic779b6ab57c71c7f6fa53467bf1ba3ee17cab0ea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-02-20 20:19:40 +00:00
Cristian Adam
edb8b0aeb7 CMake: Add QTC_USE_LLVM_LINKER option
llvm-link is faster on macOS than ld64. llvm-link can also be used with
MinGW GCC's ld which is very slow in debug mode.

Change-Id: Ie519f3111e05cfc7dffab2676108a0d53ebe08b2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-09 14:28:12 +00:00
Tim Jenssen
98a28d30bc QmlDesigner: fix LESS_EQUAL -> GREATER_EQUAL Qt 6.4.3 check
Change-Id: I4718e1afa555164d1b41e8f577a915d915187e30
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-08-16 10:16:37 +00:00
Tim Jenssen
91a931dd21 QmlDesigner: build it only if Qt is GREATER_EQUAL 6.4.3
Change-Id: Iccd05a7d4f4ace47fd9398bdc78584e3919ec595
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-15 18:57:48 +00:00
Tim Jenssen
1b6c0ff56c Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
2023-05-22 21:13:40 +02:00
Marco Bubke
2694d6a1f5 Add feature to disable QmlDesigner and related files
QTC_WITH_QMLDESIGNER or WITH_QMLDESIGNER has to be set to OFF to disable
QmlDesigner related code.

Change-Id: I7e25200fe856fcc7de3493cfa394cdd4f923e0bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-19 17:19:33 +00:00
Christian Stenger
eec0ea0607 Fix build with qbs as submodule and CMake < 3.18
Broke with 66d4e12a58.

Change-Id: I71bf156b8bba27b3285aab39db56f2ec055bff0c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-27 09:08:28 +00:00
Eike Ziller
66d4e12a58 Build: Remove FindQt5.cmake
No longer needed, since we generally only support building with
Qt 6 nowadays, and the parts that still do support building with
Qt 5 handle that manually.

Change-Id: I72381589ca3ab7bf1af88d9f185cad7f0cdf149c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-02-23 07:12:44 +00:00
Eike Ziller
06c4df37b9 CMake build: Remove usages of Qt5_VERSION
and remove checks for Qt < 6.2, since that is our minimum version.
Except for sdktool and qml2puppet.

Change-Id: Id36cd1a15a5a6e5480e4ae5d0a8ffaea4b2a1864
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-24 15:35:46 +00:00
Eike Ziller
55fa109b59 CMake build: Use version-less Qt targets
Since we do not support Qt < 5.15 anymore, and as a first step
for getting rid of our special FindQt5.cmake.

Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-01-05 10:13:16 +00:00
Eike Ziller
01a4f47781 Build: Disable cpack for commercial sources
There isn't a single license that could be used, so to support this, it
would need to be chosen somehow. Just disable for now, because otherwise
CMake configuration breaks.

Fixes: QTCREATORBUG-28603
Change-Id: I26a01d6ab317ffeb212d6e5517100eaf07963377
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-12-23 08:59:13 +00:00
Cristian Adam
860d003a34 CMake: Add cpack packaging support
Tested on all desktop platforms like this:

  * Windows with cpack -G NSIS64|WIX|IFW
  * Ubuntu Linux with cpack -G DEB
  * macOS with cpack -G DragNDrop

Fixes: QTCREATORBUG-28199
Change-Id: I5cd66aa387cc9677303ac3aece28eccb710d074f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-28 13:44:12 +00:00
Eike Ziller
b364cfde23 Install and ship change logs
And add a menu entry Help > Change Log... (macOS: Qt Creator > Change
Log...) for looking at them.

Change-Id: If444b3ff2465290b9beb4ccbb8d0ddf32a636db4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-06-29 12:04:37 +00:00
Eike Ziller
6a296ab68a Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68
2022-05-18 13:35:47 +02:00
Eike Ziller
55951a6ca0 MSVC: Disable bogus warning
MSVC incorrectly warns when using a static method in a lambda that
has non-static overloads, and not capturing 'this' in the lambda.
That wouldn't be a big issue if other compilers wouldn't then
warn about 'this' being captured and not used.

Simply disable the warning.

Change-Id: I40b96c4758f7468c1e6f3577119123e0c7abf241
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-13 08:59:33 +00:00
Tim Jenssen
839502650c qds: ENABLE_CRASHPAD on macos (universal builds)
using a newer crashpad version build with:

git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
export PATH=$PWD/depot_tools:$PATH
mkdir crashpad
cd crashpad
../depot_tools/fetch crashpad
cd crashpad
gn gen out/Default --args='target_cpu="mac_universal"'
ninja -C out/Default

Change-Id: I782c09cb564aff725652cd1419a8dec78bc04fc5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-05-12 10:06:03 +00:00
Marcus Tillmanns
44a5d25f16 CMake: add defaults from environment for PCH and Tests
Change-Id: I7881c483f8c6f35463cff70ee1dbe91f2e6f810b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-11 08:04:37 +00:00
Cristian Adam
c0bca00bd9 CMake: Fix static build when using a static build of Qt
This fixes two issues:
1. the QT_FEATURE_static_runtime feature of a static build of Qt
2. the static sqlite sql driver bundled with a static build of Qt

Change-Id: Ia245ee3d8f7205c536c9fa77a4ba53ef066f968c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-06 16:40:22 +00:00
David Schulz
ca7a18568c CMake: add ccache option
Change-Id: I482b0f3ac372f141e465b72fbcca9d8b5c5b352d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-04-11 12:29:26 +00:00
Tim Jenssen
0f7a4484d0 qds: disable crashpad with universal builds
Change-Id: Iafb1264bfc6b669fd327b052d39ae97c12e329b4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-22 21:09:59 +00:00
Cristian Adam
47667772c7 CMake: Enable higher compiler warnings for building Qt Creator
The functionality comes from Qt6 and will be enabled only for Qt6 builds.

/w3 level for MSVC, -Wall -Wextra for the rest of compilers.

Change-Id: Ib62a27e50ce37a6a860ba2bfa1bdb80a7ae60ace
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-25 09:54:49 +00:00
Christian Kandeler
9528762855 Disable -Wmissing-field-initializers when building with GCC
This warning is enabled with -Wextra, but incomplete aggregate
initialization is quite common in modern C++ due to direct member
initialization, and we make use of that in Creator in several places.

Change-Id: I585dd70e7c5c52e4549f1c5e3b8d16cc40b260ce
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-17 09:33:20 +00:00
Eike Ziller
1221552377 Require CMake 3.16 and remove workarounds
CMake 3.16 is available on the major Linux distributions nowadays,
so we can get rid of some workarounds.

Change-Id: I32500375748f33c3e40fbd7a08824d823f817a8f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-02 08:55:31 +00:00
Eike Ziller
9d8a419d10 Remove qmake build files
Removes qmake as a build system for building Qt Creator itself.
Keep them for some tests that are not completely moved to CMake yet.

Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-20 12:18:15 +00:00
Cristian Adam
e9f3f8cc64 CMake: Use newer FindPython3 module for CMake version greater than 3.12
FindPythonInterp and FindPythonLibs are deprecated since CMake 3.12.

Fixes: QTCREATORBUG-26727
Change-Id: I53400d49ef6888bbeabb063a873c494b11d27e15
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-19 18:25:18 +00:00
Allan Sandfeld Jensen
4ccbbc2f24 Do not pick up KF5 libraries when building against Qt6
Pick-to: 6.0
Fixes: QTCREATORBUG-26742
Change-Id: I535c4b3f0718104136ed1b498166083c6eba5688
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-12-16 12:31:09 +00:00
Cristian Adam
7a0bdccadf CMake: Remove debug list source files comparison
This was needed in the early days of the CMake port when the list of
source files would change due to being added to the qmake project
files.

Change-Id: I7afd219b24ab7a0d87fce26ba35dac75cf8caa5b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-29 10:34:18 +00:00
Joerg Kreuzberger
efdaeaba43 Add option to build QtCreator with sanitizer
Fixes: QTCREATORBUG-26318
Change-Id: I44589b5bb39958eda2329b444e4857e8f61823bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-05 09:03:41 +00:00
Cristian Adam
7e62840ec1 CMake: Define BUILD_WITH_PCH before usage
On Windows QtCreatorAPIInternal.cmake would contain a check for
BUILD_WITH_PCH and if not set add a few defines to the DEFAULT_DEFINES.

First time the BUILD_WITH_PCH would not be set, because the option
will be set later, the DEFAULT_DEFINES will contain the specific non-pch
defines.

The second time BUILD_WITH_PCH would be ON and those non-pch
specific DEFAULT_DEFINES will be removed, and the build system has
to do a full rebuild because the defines changed.

Change-Id: I3f039a91667affc35f18103cfed062481f9dc93e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-10-20 19:18:03 +00:00
Eike Ziller
ae0b648a85 CMake build: Allow compilation without QtQuick
Disable the parts that require it in that case.

Change-Id: I3f62eb9b325905ea225009aad6b9020cef545da6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-20 12:07:39 +00:00
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
Alessandro Portale
9eb7d5246a CMake build: Define common output directory for qt_add_qml_module
In order to enable tools like qmllint and in order to avoid the
following warning, define QT_QML_OUTPUT_DIRECTORY

Warning message:
The Tracing target is a QML module with target path QtCreator/FooBar.
It uses an OUTPUT_DIRECTORY of foobar, which should end in the same
target path, but doesn't. Tooling such as qmllint may not work
correctly.

Since this change is relevant for the build against Qt 6.2-Beta4,
common_environment.yaml gets bumped, accordingly.

Change-Id: Ic6766cf29baddd7c22b68270a0f1702aade7c53f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-10 10:57:44 +00:00
Eike Ziller
b1171f83c1 CMake build: Enable BUILD_WITH_PCH for builds with Qt 6
The issues have been fixed in the meantime

Fixes: QTCREATORBUG-25950
Change-Id: I22cf765acd3008a5b216a9e6afe5854589c7b515
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-07-01 14:04:20 +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
Youri Westerman
103aa8be7c Add more information to appdata xml
- Add oars content rating to appdata xml
- Add screenshots to appdata xml
- Add release info

Change-Id: I61bf023814149983f7a64e03f49eb8d998dac85b
Reviewed-by: Youri Westerman <tetracon@gmail.com>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-05 07:57:01 +00:00
Eike Ziller
79afbe7f14 COIN: Add hack to support debug info with sccache and MSVC
sccache does not support the "/Zi /FS" option for debug information
with MSVC. Optionally replace "/Zi" by "/Z7", which leaves debug
information in the object files and only collects it at link time.
See also qtbase 2354274f39934b94383923834479901106489def.

Change-Id: Id94c2116f3c4192556dbdf8fe82b12ce0a204273
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-26 07:01:51 +00:00
Eike Ziller
4b3a746332 CMake build: Fix remaining issues with Devel package
On Linux (and Windows) we should not create toplevel files (README.md
etc) or directories (doc/, scripts/ etc).

On macOS, move the whole Devel package contents into the app bundle,
because that is installed toplevel in the Qt installers, and we
shouldn't even create include/, lib/ or any other directory at the
toplevel at all.

Since the prefix path must now point to the Resources folder inside the
app bundle, adapt build_plugin.py to also accept --qtc-path pointing to
the app bundle (Qt Creator.app) itself, and also to the app bundles
parent directory. Adapt the Qt Creator plugin project template
similarly.

Task-number: QTCREATORBUG-25414
Fixes: QTCREATORBUG-25415
Change-Id: Ic756237fb920b54b1ec95d076649ad947b39a7e8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-06 10:59:27 +00:00
Eike Ziller
a3b537ad39 CMake build: Disable FakeVim and building with PCH with Qt 6
FakeVim does not compile on MSVC because Qt 6 doesn't like
meta types that are recursive maps with keys that have a custom
operator==.
Building with PCH has different issues on macOS and MSVC.

Change-Id: Id1b9580f7347f1c8facade67fd74532a023af41f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-03-10 10:40:04 +00:00
Eike Ziller
c55e59cb77 Merge remote-tracking branch 'origin/4.14'
Change-Id: Ib9512b4fc5e17b04ca4be79fc315e79a52d06497
2021-02-22 12:19:58 +01:00
Eike Ziller
7cb81fb5ba CMake build: Add .pri files to development package
This adds at least partial, transitional support for building
3rdparty plugins with qmake against Qt Creator built with CMake.

This might still miss some other .pri files that follow
their own naming conventions.

Fixes: QTCREATORBUG-24055
Fixes: QTCREATORBUG-25334
Change-Id: I83cc547da938976c2ec12a21a17f286b937147f7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-22 07:30:33 +00:00
Christian Stenger
ced96a480d CMake: merge binary directories of sub projects
...into top level. Exceptions are applied explicitly.

Change-Id: I59c54967dffc0bef2e8cc05c73763fcf18c12517
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-05 14:09:12 +00:00
Eike Ziller
44901a3863 Find Crashpad via CMake configuration
Makes it possible to point CMake to crashpad via CMAKE_PREFIX_PATH
if it was built to <crashpad>/out/Default, or by setting individual
CRASHPAD_* variables to the sources and build results.

Change-Id: I9634fe7ab8c1e14b7e0f3ccf3415396c8dc1e71a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-01-20 15:26:03 +00:00
Eike Ziller
919ffcb0fb cmake build: Add option to build against system SyntaxHighlighting lib
Enable/disable our own KSyntaxHighlighting by default
depending on the availability of KF5SyntaxHighlighting.
If that is available, it still is possible to turn the building
and using of our own KSyntaxHighlighting copy on by enabling
BUILD_LIBRARY_KSYNTAXHIGHLIGHTING.

Fixes: QTCREATORBUG-25076
Change-Id: I3545fc12d87572d7eb6f5977994b081ff7ea3880
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-11 09:37:23 +00:00
Eike Ziller
d04355dfb0 cmake build: Re-add a "Dependencies" component that runs deploy script
And use that from the build script.

Change-Id: I97d5b593cf703bb8e51556240f37c80aad654732
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-24 14:10:07 +00:00
Eike Ziller
05a1b2a6e8 cmake build: Remove unused component "Dependencies"
We don't use it for packaging, nor for github anymore, it duplicates a
whole lot of logic, and that only partially (as an example fixing the
RPATH for clang tools on macOS is missing), and the Clang part only
works with CMake >= 3.14 ("file(READ_SYMLINK"), which was the final
trigger of this patch.

Change-Id: I21ff6b01297009eff15bda36963e729dea4927c8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-23 10:46:39 +00:00
Eike Ziller
9d38e22a9f cmake build: Copy/install correct branding file
When changing branding, we need to copy and install that different
branding file instead of the standard one.

Change-Id: I3a2f8391b5e5ed1c4c79b81294ed6221df5e7ddc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-10 15:52:21 +00:00