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

Small fixes

Browse Source
This commit is contained in:
Pawel Polanski
2011-05-10 14:05:16 +02:00
parent 90507ed606
commit ab0bad2e67
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
View File

@@ -103,7 +103,6 @@ void S60PublisherOvi::setBuildConfiguration(Qt4BuildConfiguration *qt4bc)
m_qt4bc = qt4bc;
}
void S60PublisherOvi::setDisplayName(const QString &displayName)
{
m_displayName = displayName;

7
src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
View File

@@ -165,12 +165,12 @@ void S60PublishingSisSettingsPageOvi::globalVendorNameChanged()
ui->globalVendorNameOkLabel,
ui->globalVendorNameErrorLabel,
ui->globalVendorNameErrorReasonLabel,
tr("%1 is a default vendor name used for testing and development. <br>"
tr("\"%1\" is a default vendor name used for testing and development. <br>"
"The Vendor_Name field cannot contain the name 'Nokia'. <br>"
"You are advised against using the default names 'Vendor' and 'Vendor-EN'. <br>"
"You should also not leave the entry blank. <br>"
"see <a href=\"http://www.forum.nokia.com/Distribute/Packaging_and_signing.xhtml\">Packaging and Signing</a> for guidelines.<br>")
.arg("\"" + ui->globalVendorNameLineEdit->text() + "\""));
.arg(ui->globalVendorNameLineEdit->text()));
m_publisher->setVendorName(ui->globalVendorNameLineEdit->text());
}
@@ -303,7 +303,8 @@ void S60PublishingSisSettingsPageOvi::showWarningsForUnenforcableChecks()
//Warn about use of unreleased Qt Versions
//ui->qtVersionWarningLabel->show(); //looks better without...
ui->qtVersionWarningReasonLabel->setText(tr("Please verify that you have a released version of Qt. <br>"
"<a href=\"http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian\">Qt Packages Distributed by Smart Installer</a> has a list of released Qt versions."));
"<a href=\"http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian\">"
"Qt Packages Distributed by Smart Installer</a> has a list of released Qt versions."));
}
} // namespace Internal