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

8
src/plugins/qt4projectmanager/wizards/qtwizard.cpp
View File

@@ -242,9 +242,9 @@ int BaseQt4ProjectWizardDialog::addTargetSetupPage(QSet<QString> targets, bool m
resize(900, 450);
if (mobile) {
m_targetSetupPage->setPreferredFeatures(QSet<QString>() << Constants::MOBILE_TARGETFEATURE_ID);
m_targetSetupPage->setPreferredFeatures(QSet<QString>() << QLatin1String(Constants::MOBILE_TARGETFEATURE_ID));
} else {
m_targetSetupPage->setPreferredFeatures(QSet<QString>() << Constants::DESKTOP_TARGETFEATURE_ID);
m_targetSetupPage->setPreferredFeatures(QSet<QString>() << QLatin1String(Constants::DESKTOP_TARGETFEATURE_ID));
}
if (id >= 0)
@@ -316,7 +316,9 @@ bool BaseQt4ProjectWizardDialog::isTargetSelected(const QString &targetid) const
void BaseQt4ProjectWizardDialog::generateProfileName(const QString &name, const QString &path)
{
const QString proFile = QDir::cleanPath(path + QChar('/') + name + QChar('/') + name + QLatin1String(".pro"));
const QString proFile =
QDir::cleanPath(path + QLatin1Char('/') + name + QLatin1Char('/')
+ name + QLatin1String(".pro"));
m_targetSetupPage->setProFilePath(proFile);
}