Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/network/socket/qlocalserver.cpp

    r755 r769  
    123123    d->pendingConnections.clear();
    124124    d->closeServer();
    125     d->serverName = QString();
    126     d->fullServerName = QString();
    127     d->errorString = QString();
     125    d->serverName.clear();
     126    d->fullServerName.clear();
     127    d->errorString.clear();
    128128    d->error = QAbstractSocket::UnknownSocketError;
    129129}
     
    229229
    230230    if (!d->listen(name)) {
    231         d->serverName = QString();
    232         d->fullServerName = QString();
     231        d->serverName.clear();
     232        d->fullServerName.clear();
    233233        return false;
    234234    }
Note: See TracChangeset for help on using the changeset viewer.