Changeset 427

Show
Ignore:
Timestamp:
03/14/06 23:23:21 (3 years ago)
Author:
edmanm
Message:

Stop Qmake from ignoring us if we said "-config release" on the command-line.
My experiments tell me that debug is the default anyway, so specifying it was
silly. Justin will have to check that this logic holds on windows, where the
building with debug stuff is a bit wacky anyway.

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/Vidalia.pro

    r411 r427  
    2929 
    3030TEMPLATE = app 
    31 CONFIG  += qt thread debug warn_on 
     31CONFIG  += qt thread warn_on 
    3232QT      += network 
    3333 

  • trunk/src/util/net.cpp

    r391 r427  
    2727#include <QList> 
    2828#include <QUrl> 
     29#include <QUdpSocket> 
    2930 
    3031#include "net.h" 
    3132#include "http.h" 
    3233 
     34#include <QtDebug> 
    3335 
    3436/** Returns the IP address of the local machine. */ 
    … …  
    3638net_local_address() 
    3739{ 
    38   QAbstractSocket localSock(QAbstractSocket::TcpSocket, 0); 
     40  QUdpSocket localSock; 
     41  //QAbstractSocket localSock(QAbstractSocket::UdpSocket, 0); 
     42  localSock.connectToHost("18.0.0.1", 9); 
     43  localSock.waitForConnected(); 
    3944  QHostAddress localAddr = localSock.localAddress(); 
     45  qDebug() << localAddr.toString(); 
    4046  if (localAddr.isNull()) { 
     47    qDebug("Is null!"); 
    4148    return QHostAddress::LocalHost; 
    4249  }