Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / tools / qmlviewer / proxysettings.cpp

diff --git a/tools/qmlviewer/proxysettings.cpp b/tools/qmlviewer/proxysettings.cpp
index 8bc778d..9b0d2a6 100644 (file)
--- a/tools/qmlviewer/proxysettings.cpp
+++ b/tools/qmlviewer/proxysettings.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the tools applications of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -51,11 +51,7 @@ ProxySettings::ProxySettings (QWidget * parent)
     : QDialog (parent), Ui::ProxySettings()
 {
     setupUi (this);
-
-#if !defined Q_WS_MAEMO_5
-    // the onscreen keyboard can't cope with masks
     proxyServerEdit->setInputMask(QLatin1String("000.000.000.000;_"));
-#endif
     QIntValidator *validator = new QIntValidator (0, 9999, this);
     proxyPortEdit->setValidator(validator);