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/clangtools/virtualfilesystemoverlay.h
	src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui
	src/plugins/qmldesigner/designercore/model/abstractview.cpp

Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
This commit is contained in:
Eike Ziller
2020-08-31 14:49:19 +02:00
parent b5e2485fbf e8eafd85ee
commit 6477a07654
89 changed files with 1247 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
View File

@@ -32,12 +32,12 @@
#include <QTimer>
#include <QWidget>
namespace Ui {
class MesonBuildSettingsWidget;
}
namespace MesonProjectManager {
namespace Internal {
namespace Ui { class MesonBuildSettingsWidget; }
class MesonBuildConfiguration;
class MesonBuildSettingsWidget : public ProjectExplorer::NamedWidget
{

4
src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MesonBuildSettingsWidget</class>
<widget class="QWidget" name="MesonBuildSettingsWidget">
<class>MesonProjectManager::Internal::MesonBuildSettingsWidget</class>
<widget class="QWidget" name="MesonProjectManager::Internal::MesonBuildSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>

7
src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
View File

@@ -30,12 +30,11 @@
#include <QTabWidget>
#include <QWidget>
namespace Ui {
class GeneralSettingsWidget;
}
namespace MesonProjectManager {
namespace Internal {
namespace Ui { class GeneralSettingsWidget; }
class GeneralSettingsWidget final : public Core::IOptionsPageWidget
{
Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsWidget)

4
src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>GeneralSettingsWidget</class>
<widget class="QWidget" name="GeneralSettingsWidget">
<class>MesonProjectManager::Internal::GeneralSettingsWidget</class>
<widget class="QWidget" name="MesonProjectManager::Internal::GeneralSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>

5
src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
View File

@@ -29,13 +29,10 @@
#include "utils/optional.h"
#include <QWidget>
namespace Ui {
class ToolItemSettings;
}
namespace MesonProjectManager {
namespace Internal {
namespace Ui { class ToolItemSettings; }
class ToolTreeItem;
class ToolItemSettings : public QWidget

4
src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ToolItemSettings</class>
<widget class="QWidget" name="ToolItemSettings">
<class>MesonProjectManager::Internal::ToolItemSettings</class>
<widget class="QWidget" name="MesonProjectManager::Internal::ToolItemSettings">
<property name="geometry">
<rect>
<x>0</x>

8
src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
View File

@@ -34,13 +34,11 @@
#include <QTabWidget>
#include <QWidget>
namespace Ui {
class ToolsSettingsWidget;
}
namespace MesonProjectManager {
namespace Internal {
namespace Ui { class ToolsSettingsWidget; }
class ToolTreeItem;
class ToolsSettingsWidget final : public Core::IOptionsPageWidget
{

4
src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ToolsSettingsWidget</class>
<widget class="QWidget" name="MesonToolConfigWidget">
<class>MesonProjectManager::Internal::ToolsSettingsWidget</class>
<widget class="QWidget" name="MesonProjectManager::Internal::ToolSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>