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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
This commit is contained in:
Oswald Buddenhagen
2013-02-18 13:49:05 +01:00
parent e46a63b93e 80263a5221
commit 1ffe15a471
420 changed files with 20260 additions and 13624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -11,7 +11,6 @@ QtcPlugin {
]
}
Depends { name: "Utils" }
Depends { name: "ExtensionSystem" }
Depends { name: "Aggregation" }
Depends { name: "app_version_header" }
@@ -242,7 +241,7 @@ QtcPlugin {
}
Group {
condition: qbs.targetOS == "linux"
condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
files: [
"progressmanager/progressmanager_x11.cpp",
]
@@ -251,7 +250,6 @@ QtcPlugin {
ProductModule {
Depends { name: "cpp" }
Depends { name: "Aggregation" }
Depends { name: "ExtensionSystem" }
Depends { name: "Utils" }
}
}

2
src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
View File

@@ -609,6 +609,6 @@ void ExternalToolConfig::addCategory()
void ExternalToolConfig::updateEffectiveArguments()
{
ui->effectiveArguments->setText(Utils::QtcProcess::expandMacros(ui->arguments->text(),
ui->arguments->setToolTip(Utils::QtcProcess::expandMacros(ui->arguments->text(),
Core::VariableManager::instance()->macroExpander()));
}

33
src/plugins/coreplugin/dialogs/externaltoolconfig.ui
View File

@@ -131,37 +131,20 @@
<widget class="QLineEdit" name="arguments"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="effectiveArgumentsLabel">
<property name="text">
<string>Effective Arguments:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="effectiveArguments">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="workingDirectoryLabel">
<property name="text">
<string>Working directory:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<widget class="Utils::PathChooser" name="workingDirectory">
<property name="expectedKind">
<enum>Utils::PathChooser::Directory</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QLabel" name="outputLabel">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
@@ -174,7 +157,7 @@
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QComboBox" name="outputBehavior">
<item>
<property name="text">
@@ -193,7 +176,7 @@
</item>
</widget>
</item>
<item row="6" column="0">
<item row="5" column="0">
<widget class="QLabel" name="errorOutputLabel">
<property name="toolTip">
<string>&lt;html&gt;&lt;head&gt;&lt;body&gt;
@@ -208,7 +191,7 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="5" column="1">
<widget class="QComboBox" name="errorOutputBehavior">
<item>
<property name="text">
@@ -227,7 +210,7 @@
</item>
</widget>
</item>
<item row="7" column="1">
<item row="6" column="1">
<widget class="QCheckBox" name="modifiesDocumentCheckbox">
<property name="toolTip">
<string>If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished.</string>
@@ -237,7 +220,7 @@
</property>
</widget>
</item>
<item row="8" column="0">
<item row="7" column="0">
<widget class="QLabel" name="inputLabel">
<property name="toolTip">
<string>Text to pass to the executable via standard input. Leave empty if the executable should not receive any input.</string>
@@ -247,7 +230,7 @@
</property>
</widget>
</item>
<item row="8" column="1">
<item row="7" column="1">
<widget class="QPlainTextEdit" name="inputText">
<property name="lineWrapMode">
<enum>QPlainTextEdit::NoWrap</enum>

46
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1268,7 +1268,18 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
IEditor *EditorManager::openEditor(const QString &fileName, const Id &editorId,
OpenEditorFlags flags, bool *newEditor)
{
return m_instance->openEditor(m_instance->currentEditorView(), fileName, editorId, flags, newEditor);
return m_instance->openEditor(m_instance->currentEditorView(),
fileName, editorId, flags, newEditor);
}
IEditor *EditorManager::openEditorInNextSplit(const QString &fileName, const Id &editorId, OpenEditorFlags flags, bool *newEditor)
{
if (!m_instance->hasSplitter())
m_instance->splitSideBySide();
m_instance->gotoOtherSplit();
return m_instance->openEditor(m_instance->currentEditorView(),
fileName, editorId, flags, newEditor);
}
static int extractLineNumber(QString *fileName)
@@ -2237,22 +2248,23 @@ void EditorManager::removeAllSplits()
void EditorManager::gotoOtherSplit()
{
if (d->m_splitter->isSplitter()) {
SplitterOrView *currentView = d->m_currentView;
if (!currentView && d->m_currentEditor)
currentView = d->m_splitter->findView(d->m_currentEditor);
if (!currentView)
currentView = d->m_splitter->findFirstView();
SplitterOrView *view = d->m_splitter->findNextView(currentView);
if (!view)
view = d->m_splitter->findFirstView();
if (view) {
if (IEditor *editor = view->editor()) {
setCurrentEditor(editor, true);
editor->widget()->setFocus();
} else {
setCurrentView(view);
}
if (!d->m_splitter->isSplitter())
splitSideBySide();
SplitterOrView *currentView = d->m_currentView;
if (!currentView && d->m_currentEditor)
currentView = d->m_splitter->findView(d->m_currentEditor);
if (!currentView)
currentView = d->m_splitter->findFirstView();
SplitterOrView *view = d->m_splitter->findNextView(currentView);
if (!view)
view = d->m_splitter->findFirstView();
if (view) {
if (IEditor *editor = view->editor()) {
setCurrentEditor(editor, true);
editor->widget()->setFocus();
} else {
setCurrentView(view);
}
}
}

2
src/plugins/coreplugin/editormanager/editormanager.h
View File

@@ -117,6 +117,8 @@ public:
static QString splitLineNumber(QString *fileName);
static IEditor *openEditor(const QString &fileName, const Id &editorId = Id(),
OpenEditorFlags flags = 0, bool *newEditor = 0);
static IEditor *openEditorInNextSplit(const QString &fileName, const Id &editorId = Id(),
OpenEditorFlags flags = 0, bool *newEditor = 0);
static IEditor *openEditorWithContents(const Id &editorId,
QString *titlePattern = 0, const QString &contents = QString());