add QWidget include in src/plugins/qmldesigner/libs/designercore/model/model.cpp
prepare src/plugins/lua/CMakeLists.txt if lua plugin is not built
Necessary change in:
src/plugins/qmldesigner/components/toolbar/messagemodel.h
Because Utils::Id is a friend of qHash now, QtCreator API
removed uniqueIdentifier().
std::unordered_map<quintptr, ProjectExplorer::TaskCategory>
->
QHash<Utils::Id, ProjectExplorer::TaskCategory> m_categories = {};
other resolved Conflicts were in:
cmake/QtCreatorAPI.cmake
cmake/QtCreatorAPIInternal.cmake
share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl
share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
src/plugins/effectcomposer/effectcomposerview.cpp
src/plugins/effectcomposer/effectcomposerwidget.cpp
src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp
src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
src/plugins/qmldesigner/designmodecontext.cpp
src/plugins/qmldesigner/designmodewidget.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
src/plugins/studiowelcome/examplecheckout.h
Change-Id: Ia6c204460baf4de886e45666d859ca048d578bcb
Instead of PUBLIC_DEPENDS, our build system would keep record and track
recursive plugin dependencies manually, by attaching a custom property
to the targets that reference the targets it depends on. Then it used
DEPENDS to add all these recursive dependencies.
Get rid of this custom reimplementation of PUBLIC_DEPENDS and just use
that instead. This needs a fix that we should not separately export the
licensechecker plugin when doing a super-repository build. Otherwise
external plugins configured with the result cannot find the licensechecker
target, which is referenced by the vxworks target that is exported
together with the QtCreatorConfig.
Change-Id: I1444a0b16e5519f5310f9c0ffdfc49481ac228a4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
There is no need to state dependencies in the plugin meta data
recursively, they are resolved recursively in the end anyway.
This reduces the effort that we do in CMake during configure time.
Change-Id: Ic3161a405f6c13ba09cfc3211f03c4b4426afbc8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
That we add to plugin targets, so these are also available when building
external plugins. Helps for e.g. recursive PLUGIN_DEPENDS.
Change-Id: I89b10a58a9aa3ceb720c0dff4b76564d1cb06ca3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
We want to use the libraries in different projects where the plugins
are not present.
Change-Id: I51382ac7cfcf06871ac99a6b53b84840ca39bf00
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This reverts commit f5bb913c9d.
Reason for revert: This breaks snapshots build for the license plugin
Change-Id: I52a9f0b40081d648de68a5bdc3d9b3962e19061a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
We want to use the libraries in different projects where the plugins
are not present.
Change-Id: Ia3b183dcf57c7c63c75a17e9d5e3c3ef672e668e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Many source files have Q_OBJECT inside #ifdef WITH_TESTS. Automoc uses
a very basic parser that detects this file as mocable, but moc shows a
warning: "No relevant classes found."
Just suppress the warning on this case.
See also upstream issue:
https://gitlab.kitware.com/cmake/cmake/-/issues/26224
Fixes: QTCREATORBUG-31492
Change-Id: Idea7b05b4faf4011d7e1ecb44495341d73654170
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Orkun Tokdemir <orkun.tokdemir@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
On macOS, files in Contents/PlugIns/ need to be codesigned individually.
Since Lua plugins are not really binaries, per Apple's documentation
that is to be avoided (and we currently only sign executables there).
Just move Lua plugins generally to the resources directory, like we do
for other scripts like the debugger Python scripts, and load them from
there.
Change-Id: Idabd6b7c0c7c6e842b1752488cb7073f00e7be49
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
It offers an clean interface to disable warnings
Change-Id: Ia19360994d7ca439d067d2370d001d5aeae3999d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
- remove stray ;
- add check for wrong arguments
- use qtc_copy_to_builddir which fixes the location and incremental builds
Change-Id: I57fcac03bc9572caf506472ad92046332367e70a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
It is important that the LicenseChecker's initialization (if that is
available) happens before QmlDesigner's, so add an optional dependency
to reflect that.
Add a PLUGIN_MANUAL_DEPENDS option to add_qtc_plugin, which explicitly
specifies the name, version and type. The existing PLUGIN_RECOMMENDS
requires the plugin target to exist to extract the plugin's version.
Change-Id: Ie2cf84e75964ce91ed8bbcdbeee9fa9770bed641
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
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>
Adding SYSTEM_INCLUDE for which you get no warnings. Fix
PUBLIC_SYSTEM_INCLUDE to work for all cases where PUBLIC_INLCUDES works.
Change-Id: I7059c2879004743c13c368220596081dd054407a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
The `env_with_default` function is part of Utils.cmake, which would need
to be deployed. But it can't be part of QtCreatorAPIInternal.cmake due
to its usage before the inclusion of QtCreatorAPIInternal.cmake in the
main QtCreator CMakeLists.txt file.
A sepparate function needs to do the task.
Amends 1036c776f5
Change-Id: I95344dd98c5fa0258303ed8d02855584a1945144
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Add another environment variable whether CMake should check for ccache
and adjust the compiler options accordingly when building Qt Creator.
Change-Id: I796f29d7f6ad4a1f054f978d50dbd0120b873aea
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Tests that create a QApplication need to be started with
"-platform minimal" so that they won't fail on build servers
without Display.
This also keeps them from distracting you if you run them while working.
Change-Id: I05df258b2204a3abd3cdea446d6a52f3e57a4a62
Reviewed-by: David Schulz <david.schulz@qt.io>
They were still using variables in qmake style.
Directly use CMake variables in the json.in files and remove the no
longer needed escaping of quotes.
Adds a fatal message if it detects the old style in a .json.in file for
easier porting.
Change-Id: I8de88d8db2da55781f0e9d72eda03f943723188e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
add_qtc_library would have set the POSITION_INDEPENDENT_CODE property
for STATIC libraries on UNIX based systems.
The OBJECT libraries need the same treatment.
Change-Id: Ia333a36ea0f35d7db3ed876cdde5b895b47644c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
for add_qtc_test and qtc_add_resources.
The condition needs to be wrapped in () because otherwise conditions
that contain AND or OR themselves break.
Change-Id: Iff64ad15c5f5b6e5a9db5a97c975bd8854c59c02
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
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>
Instead of silenty failing and resulting in broken builds/packages.
The property is only available since CMake 3.19, so limit the feature to
that.
Change-Id: I82b06e78540e81a809f7fdfe130648becfc9672e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Adding qtc_enable_sanitize to add_qtc_executable to also instrument applications
Changing qtc_enable_sanitize to use target_compile_options instead of trying
to modify CMAKE_CXX_FLAGS_DEBUG and hoping that nobody else overwrites it,
which previously erased the added flags.
Adds support for MSVC /fsanitize
Change-Id: Ida80cfd7ef7ea91b2d6473fdc047cb7132cdfec6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
