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

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-08-02 07:41:18 +02:00
parent 7e7460ad33 ee8e1122ba
commit d9f8a25f80
188 changed files with 2930 additions and 4166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/basetexteditor.h
View File

@@ -636,7 +636,6 @@ public:
inline ITextMarkable *markableInterface() { return e->markableInterface(); }
void setContextHelpId(const QString &id) { m_contextHelpId = id; }
QString contextHelpId() const; // from IContext
inline void setTextCodec(QTextCodec *codec, TextCodecReason = TextCodecOtherReason) { e->setTextCodec(codec); }
@@ -655,7 +654,6 @@ private slots:
private:
BaseTextEditorWidget *e;
mutable QString m_contextHelpId;
QToolBar *m_toolBar;
QWidget *m_stretchWidget;
QAction *m_cursorPositionLabelAction;