Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

[qt-creator-jp/qt-creator-jp.git] / src / plugins / coreplugin / generalsettings.h

diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h
index ef85249..89ea180 100644 (file)
--- a/src/plugins/coreplugin/generalsettings.h
+++ b/src/plugins/coreplugin/generalsettings.h
@@ -55,6 +55,7 @@ public:
     QString displayName() const;
     QString category() const;
     QString displayCategory() const;
+    QIcon categoryIcon() const;
     QWidget* createPage(QWidget *parent);
     void apply();
     void finish();
@@ -81,6 +82,7 @@ private:
     Ui::GeneralSettings *m_page;
     QString m_searchKeywords;
     QPointer<QMessageBox> m_dialog;
+    QList<QTextCodec *> m_codecs;
 };
 
 } // namespace Internal