forked from qt-creator/qt-creator
		
	Core: Make IOptionsPage::categoryIcon a Utils::Icon
This is necessary for themable + HighDPI icons in the options dialog. Change-Id: I8e3ff87a24591af40bb76b39cd970443d7678fae Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
		@@ -167,7 +167,7 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSe
 | 
			
		||||
    setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME));
 | 
			
		||||
    setCategory(Constants::CPP_SETTINGS_CATEGORY);
 | 
			
		||||
    setDisplayCategory(QCoreApplication::translate("CppTools",Constants::CPP_SETTINGS_TR_CATEGORY));
 | 
			
		||||
    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
 | 
			
		||||
    setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QWidget *CppCodeModelSettingsPage::widget()
 | 
			
		||||
 
 | 
			
		||||
@@ -525,7 +525,7 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) :
 | 
			
		||||
    setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME));
 | 
			
		||||
    setCategory(Constants::CPP_SETTINGS_CATEGORY);
 | 
			
		||||
    setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
 | 
			
		||||
    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
 | 
			
		||||
    setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QWidget *CppCodeStyleSettingsPage::widget()
 | 
			
		||||
 
 | 
			
		||||
@@ -363,7 +363,7 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin
 | 
			
		||||
    setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME));
 | 
			
		||||
    setCategory(Constants::CPP_SETTINGS_CATEGORY);
 | 
			
		||||
    setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
 | 
			
		||||
    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
 | 
			
		||||
    setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QWidget *CppFileSettingsPage::widget()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user