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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684
This commit is contained in:
Eike Ziller
2015-11-12 13:43:08 +01:00
parent 2afae6f2c6 0bcddcd014
commit d13b22e6bc
181 changed files with 13518 additions and 2106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmlprofiler/qmlprofileroptionspage.h
View File

@@ -39,6 +39,7 @@ namespace Internal {
class QmlProfilerOptionsPage : public Core::IOptionsPage
{
Q_OBJECT
public:
QmlProfilerOptionsPage();

2
src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
View File

@@ -45,7 +45,7 @@ QmlProfilerRunConfigurationAspect::QmlProfilerRunConfigurationAspect(
setProjectSettings(new QmlProfilerSettings());
setGlobalSettings(QmlProfilerPlugin::globalSettings());
setId(Constants::SETTINGS);
setDisplayName(tr("QML Profiler Settings"));
setDisplayName(QCoreApplication::translate("QmlProfilerRunConfiguration", "QML Profiler Settings"));
setUsingGlobalSettings(true);
resetProjectToGlobalSettings();
}