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

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
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
This commit is contained in:
Eike Ziller
2020-08-10 14:23:50 +02:00
parent 84e4b3af31 acadee710e
commit 3944162039
205 changed files with 6161 additions and 10173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/mesonprojectmanager/settings/general/generalsettingspage.h
View File

@@ -27,11 +27,15 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <QCoreApplication>
namespace MesonProjectManager {
namespace Internal {
class MesonTools;
class GeneralSettingsPage final : public Core::IOptionsPage
{
Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsPage)
public:
GeneralSettingsPage();
void saveAll();

2
src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
View File

@@ -33,6 +33,8 @@ namespace MesonProjectManager {
namespace Internal {
class MesonToolKitAspect final : public ProjectExplorer::KitAspect
{
Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::MesonToolKitAspect)
public:
MesonToolKitAspect();

2
src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
View File

@@ -33,6 +33,8 @@ namespace MesonProjectManager {
namespace Internal {
class NinjaToolKitAspect final : public ProjectExplorer::KitAspect
{
Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::NinjaToolKitAspect)
public:
NinjaToolKitAspect();

4
src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.h
View File

@@ -27,11 +27,15 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <QCoreApplication>
namespace MesonProjectManager {
namespace Internal {
class MesonTools;
class ToolsSettingsPage final : public Core::IOptionsPage
{
Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsPage)
public:
ToolsSettingsPage();
};