diff options
| author | Eike Ziller <[email protected]> | 2020-08-10 14:23:50 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2020-08-10 15:56:54 +0200 |
| commit | 3944162039d9cea30384a0d867afab35cc3bfabf (patch) | |
| tree | ec07f797055a69823f47edff588f5dc82a1dfeca /src/plugins/debugger/debugger.pro | |
| parent | 84e4b3af31364973c44ad52c8c01430d42f996a4 (diff) | |
| parent | acadee710e00cca55736db864263bdcdcbac31a6 (diff) | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
src/plugins/cmakeprojectmanager/cmakebuildstep.h
tests/auto/debugger/tst_namedemangler.cpp
tests/auto/qml/codemodel/check/tst_check.cpp
Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
Diffstat (limited to 'src/plugins/debugger/debugger.pro')
| -rw-r--r-- | src/plugins/debugger/debugger.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index 916eb693300..6c38efaca89 100644 --- a/src/plugins/debugger/debugger.pro +++ b/src/plugins/debugger/debugger.pro @@ -133,7 +133,6 @@ include(pdb/pdb.pri) include(lldb/lldb.pri) include(uvsc/uvsc.pri) include(qml/qml.pri) -include(namedemangler/namedemangler.pri) include(console/console.pri) include(analyzer/analyzer.pri) |