diff options
| author | con <qtc-committer@nokia.com> | 2010-05-20 09:28:00 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-20 09:28:00 +0200 |
| commit | 7f4cbe23832a6c7251152926ebd426b43253aa20 (patch) | |
| tree | d798304f8f7995044d53d07bbd0079856bd5579e /src/plugins/locator | |
| parent | 6f3228988dd2768c5aacec9cf7cc7facbecb9527 (diff) | |
| parent | 552a0728325ba6dec7b679c057b5e3770550d5b9 (diff) | |
| download | qt-creator-7f4cbe23832a6c7251152926ebd426b43253aa20.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/debugger/moduleshandler.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
Diffstat (limited to 'src/plugins/locator')
| -rw-r--r-- | src/plugins/locator/locatorconstants.h | 1 | ||||
| -rw-r--r-- | src/plugins/locator/settingspage.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/locator/locatorconstants.h b/src/plugins/locator/locatorconstants.h index 74d40a146c..ffc5d1e27f 100644 --- a/src/plugins/locator/locatorconstants.h +++ b/src/plugins/locator/locatorconstants.h @@ -38,6 +38,7 @@ namespace Constants { const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Filters"); const char * const LOCATOR_CATEGORY = "G.Locator"; const char * const LOCATOR_TR_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator"); +const char * const SETTINGS_CATEGORY_LOCATOR_ICON = ":/core/images/category_locator.png"; const char * const TASK_INDEX = "Locator.Task.Index"; } // namespace Constants diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index 1f913c144b..cc3e4383a0 100644 --- a/src/plugins/locator/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp @@ -71,7 +71,7 @@ QString SettingsPage::displayCategory() const QIcon SettingsPage::categoryIcon() const { - return QIcon(); // TODO: Icon for Locator + return QIcon(QLatin1String(Locator::Constants::SETTINGS_CATEGORY_LOCATOR_ICON)); } QWidget *SettingsPage::createPage(QWidget *parent) |