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

Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-13 14:20:45 +01:00
parent 2776346db4
commit 80d3f73319
56 changed files with 468 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -180,14 +180,15 @@ void Qt4ProjectConfigWidget::updateShadowBuildUi()
void Qt4ProjectConfigWidget::manageQtVersions()
{
Core::ICore *core = Core::ICore::instance();
core->showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY, QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
core->showOptionsDialog(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY),
QLatin1String(QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID));
}
void Qt4ProjectConfigWidget::manageToolChains()
{
Core::ICore *core = Core::ICore::instance();
core->showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_PAGE_ID);
core->showOptionsDialog(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY),
QLatin1String(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_PAGE_ID));
}
QString Qt4ProjectConfigWidget::displayName() const
@@ -353,7 +354,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
if (m_buildConfiguration->qmakeStep() && m_buildConfiguration->makeStep()) {
QString makefile = m_buildConfiguration->buildDirectory();
if (m_buildConfiguration->makefile().isEmpty())
makefile.append("/Makefile");
makefile.append(QLatin1String("/Makefile"));
else
makefile.append(m_buildConfiguration->makefile());
@@ -416,7 +417,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
m_ui->problemLabel->setVisible(true);
m_ui->warningLabel->setVisible(true);
m_ui->importLabel->setVisible(visible);
QString text = "<nobr>";
QString text = QLatin1String("<nobr>");
foreach (const ProjectExplorer::Task &task, issues) {
QString type;
switch (task.type) {