summaryrefslogtreecommitdiffstats
path: root/tests/auto/network-settings.h
diff options
context:
space:
mode:
authorAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-05-21 12:46:26 (GMT)
committerAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-05-21 12:46:26 (GMT)
commit3bcec82fe724f0e6b48557d3ac4cd48fb8426696 (patch)
tree85a8553bc6547bbce941ce5f71c5faeb78fb02cf /tests/auto/network-settings.h
parent47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743 (diff)
downloadQt-3bcec82fe724f0e6b48557d3ac4cd48fb8426696.zip
Qt-3bcec82fe724f0e6b48557d3ac4cd48fb8426696.tar.gz
Qt-3bcec82fe724f0e6b48557d3ac4cd48fb8426696.tar.bz2
Resolving some merge issues.
Diffstat (limited to 'tests/auto/network-settings.h')
-rw-r--r--tests/auto/network-settings.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 7204b27..88e9fb7 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -1,6 +1,4 @@
/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
@@ -308,12 +306,14 @@ private:
}
#endif
+/*
#ifdef QT_NETWORK_LIB
static QHostAddress serverIP()
{
return QHostInfo::fromName(serverName()).addresses().first();
}
#endif
+*/
};
#ifdef Q_OS_SYMBIAN