forked from qt-creator/qt-creator
		
	Centralize error/warning/info icons
There are multiple copies of these pngs in different plugins. Let's have one version in core, also as @2x variant. Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
This commit is contained in:
		@@ -32,7 +32,6 @@
 | 
			
		||||
#include <projectexplorer/target.h>
 | 
			
		||||
#include <qmakeprojectmanager/qmakeproject.h>
 | 
			
		||||
#include <qmakeprojectmanager/qmakenodes.h>
 | 
			
		||||
#include <projectexplorer/projectexplorerconstants.h>
 | 
			
		||||
#include <proparser/prowriter.h>
 | 
			
		||||
#include <QComboBox>
 | 
			
		||||
#include <QFormLayout>
 | 
			
		||||
@@ -40,6 +39,7 @@
 | 
			
		||||
#include <QMessageBox>
 | 
			
		||||
#include <QVBoxLayout>
 | 
			
		||||
#include <qtsupport/qtkitinformation.h>
 | 
			
		||||
#include <coreplugin/coreconstants.h>
 | 
			
		||||
#include <coreplugin/editormanager/editormanager.h>
 | 
			
		||||
 | 
			
		||||
using namespace Android;
 | 
			
		||||
@@ -111,7 +111,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
 | 
			
		||||
    m_sourceDirectoryWarning->setWordWrap(true);
 | 
			
		||||
    m_warningIcon = new QLabel(this);
 | 
			
		||||
    m_warningIcon->setVisible(false);
 | 
			
		||||
    m_warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)));
 | 
			
		||||
    m_warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
 | 
			
		||||
    m_warningIcon->setWordWrap(true);
 | 
			
		||||
    m_warningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user