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

Merge remote branch 'origin/2.0'

Browse Source 
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
This commit is contained in:
con
2010-05-20 09:28:00 +02:00
parent 6f3228988d 552a072832
commit 7f4cbe2383
117 changed files with 1073 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -321,7 +321,7 @@ QString CppFileSettingsPage::displayCategory() const
QIcon CppFileSettingsPage::categoryIcon() const
{
return QIcon(); // TODO: Icon for C++ or move into category
return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
}
QWidget *CppFileSettingsPage::createPage(QWidget *parent)

1
src/plugins/cpptools/cpptoolsconstants.h
View File

@@ -54,6 +54,7 @@ const char * const CPP_SETTINGS_ID = "File Naming";
const char * const CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "File Naming");
const char * const CPP_SETTINGS_CATEGORY = "I.C++";
const char * const CPP_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++");
const char * const SETTINGS_CATEGORY_CPP_ICON = ":/core/images/category_cpp.png";
} // namespace Constants
} // namespace CppTools