feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I5b8d93f2f08b62626c3f3447728c64d198b601ff
This commit is contained in:
Eike Ziller
2021-01-04 09:09:21 +01:00
parent 5c7793b07b e09867d7de
commit d95e1f940a
30 changed files with 187 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/designer/CMakeLists.txt
View File

@@ -1,13 +1,10 @@
if (WITH_TESTS)
set(TST_COMPONENT CppEditor)
endif()
add_qtc_plugin(Designer
CONDITION TARGET Qt5::DesignerComponents AND TARGET Qt5::Designer
DEPENDS designerintegrationv2
Qt5::Designer Qt5::PrintSupport Qt5::DesignerComponents
DEFINES CPP_ENABLED
PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport ResourceEditor TextEditor ${TST_COMPONENT}
PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport ResourceEditor TextEditor
PLUGIN_TEST_DEPENDS CppEditor
SOURCES
codemodelhelpers.cpp codemodelhelpers.h
cpp/formclasswizard.cpp cpp/formclasswizard.h