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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I7881fc51021c49b792a384ad9f8a4f71fc457ce2
This commit is contained in:
Eike Ziller
2017-09-04 16:12:34 +02:00
parent d9974ec6d5 33bb20ba57
commit 3543bd5d1a
29 changed files with 319 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/clangrefactoring/clangqueryexampletexteditorwidget.cpp
View File

@@ -36,6 +36,7 @@ ClangQueryExampleTextEditorWidget::ClangQueryExampleTextEditorWidget(QWidget *pa
{
m_syntaxHighlighter = new ClangQueryExampleHighlighter;
textDocument()->setSyntaxHighlighter(m_syntaxHighlighter);
textDocument()->setPlainText("class Foo {\n void function() { int local; }\n int field;\n};");
}
ClangQueryExampleHighlighter *ClangQueryExampleTextEditorWidget::syntaxHighlighter() const

35
src/plugins/clangrefactoring/clangqueryprojectsfindfilter.ui
View File

@@ -6,14 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
<width>1241</width>
<height>471</height>
<width>512</width>
<height>390</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>512</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -30,20 +45,32 @@
<widget class="ClangRefactoring::ClangQueryExampleTextEditorWidget" name="exampleSourceTextEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<horstretch>1</horstretch>
<verstretch>3</verstretch>
</sizepolicy>
</property>
<property name="placeholderText">
<string notr="true">class Foo { void function() { int x; } };</string>
</property>
</widget>
</item>
<item>
<widget class="ClangRefactoring::ClangQueryTextEditorWidget" name="queryTextEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<horstretch>1</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>700</width>
<height>0</height>
</size>
</property>
<property name="placeholderText">
<string notr="true">functionDecl()</string>
</property>
</widget>
</item>
</layout>

1
src/plugins/clangrefactoring/clangquerytexteditorwidget.cpp
View File

@@ -38,6 +38,7 @@ ClangQueryTextEditorWidget::ClangQueryTextEditorWidget(QWidget *parent)
m_hoverHandler(std::make_unique<ClangQueryHoverHandler>(m_syntaxHighlighter))
{
textDocument()->setSyntaxHighlighter(m_syntaxHighlighter);
textDocument()->setPlainText("functionDecl()");
addHoverHandler(m_hoverHandler.get());
}