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

compile fix

Browse Source
This commit is contained in:
hjk
2011-01-14 14:31:18 +01:00
parent 7195c6b5ad
commit 9e0c8ba8b4
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/ipaddresslineedit.cpp
View File

@@ -84,20 +84,20 @@ bool IpAddressLineEdit::isValid() const
void IpAddressLineEdit::validateAddress(const QString &string) void IpAddressLineEdit::validateAddress(const QString &string)
{ {
QString copy(string); QString copy = string;
int offset(0); int offset = 0;
bool isValid = m_d->m_ipAddressValidator->validate(copy, offset) == QValidator::Acceptable; bool isValid = m_d->m_ipAddressValidator->validate(copy, offset) == QValidator::Acceptable;
if (isValid != m_d->m_addressIsValid) { if (isValid != m_d->m_addressIsValid) {
if (isValid) { if (isValid) {
QPalette palette(palette()); QPalette pal(palette());
palette.setColor(QPalette::Text, m_d->m_validColor); pal.setColor(QPalette::Text, m_d->m_validColor);
setPalette(palette); setPalette(pal);
emit validAddressChanged(copy); emit validAddressChanged(copy);
} else { } else {
QPalette palette(palette()); QPalette pal(palette());
palette.setColor(QPalette::Text, Qt::red); pal.setColor(QPalette::Text, Qt::red);
setPalette(palette); setPalette(pal);
setToolTip(tr("The IP address is not valid.")); setToolTip(tr("The IP address is not valid."));
} }
m_d->m_addressIsValid = isValid; m_d->m_addressIsValid = isValid;

3
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -775,7 +775,8 @@ void S60DeviceRunControl::initCommunication()
void S60DeviceRunControl::handleContextRemoved(const TcfTrkEvent &event) void S60DeviceRunControl::handleContextRemoved(const TcfTrkEvent &event)
{ {
QVector<QByteArray> &removedItems( static_cast<const TcfTrkRunControlContextRemovedEvent &>(event).ids()); const QVector<QByteArray> removedItems
= static_cast<const TcfTrkRunControlContextRemovedEvent &>(event).ids();
if (!m_runningProcessId.isEmpty() if (!m_runningProcessId.isEmpty()
&& removedItems.contains(m_runningProcessId.toAscii())) { && removedItems.contains(m_runningProcessId.toAscii())) {
appendMessage(tr("Process has finished."), NormalMessageFormat); appendMessage(tr("Process has finished."), NormalMessageFormat);