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

Merge remote-tracking branch 'origin/3.4'

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

Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
This commit is contained in:
Eike Ziller
2015-03-11 10:35:49 +01:00
parent adf70c1a84 b201c9be2b
commit 23ec56516e
118 changed files with 2364 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljseditor/qmljscompletionassist.h
View File

@@ -49,10 +49,11 @@
namespace QmlJS { class Value; }
namespace QmlJSEditor {
namespace Internal {
class QmlJSCompletionAssistInterface;
namespace Internal {
class QmlJSAssistProposalItem : public TextEditor::AssistProposalItem
{
public:
@@ -117,8 +118,9 @@ private:
TextEditor::SnippetAssistCollector m_snippetCollector;
};
} // Internal
class QmlJSCompletionAssistInterface : public TextEditor::AssistInterface
class QMLJSEDITOR_EXPORT QmlJSCompletionAssistInterface : public TextEditor::AssistInterface
{
public:
QmlJSCompletionAssistInterface(QTextDocument *textDocument,
@@ -138,7 +140,6 @@ private:
QIcon m_darkCyanIcon;
};
} // Internal
} // QmlJSEditor
#endif // QMLJSCOMPLETIONASSIST_H