diff options
author | James McDonnell <jmcdonnell@blackberry.com> | 2016-10-26 11:03:11 -0400 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-27 06:22:41 +0000 |
commit | 145587a521c9c757d20220c9957b9003d66ccf7b (patch) | |
tree | e4cd7c7c8f6415126a60cdc9bbb162dd7dfbca52 /src/corelib/io/qurl.cpp | |
parent | c8c3d39e2116251133fb3ee25b615a1522685861 (diff) |
Recontribute QUrl::fromUserInput
Recontribute QUrl::fromUserInput under the corporate license agreement;
i.e. remove the separate BSD license from the code.
Change-Id: I1e0b4aab921fb20d2fd558fe732cea596ecbc9ca
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qurl.cpp')
-rw-r--r-- | src/corelib/io/qurl.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index c165aef5a2..cdc6b964e7 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -4128,35 +4128,6 @@ static bool isIp6(const QString &text) return !text.isEmpty() && QIPAddressUtils::parseIp6(address, text.begin(), text.end()) == 0; } -// The following code has the following copyright: -/* - Copyright (C) Research In Motion Limited 2009. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of Research In Motion Limited nor the - contributors may be used to endorse or promote products derived - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY Research In Motion Limited ''AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL Research In Motion Limited BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - - /*! Returns a valid URL from a user supplied \a userInput string if one can be deducted. In the case that is not possible, an invalid QUrl() is returned. @@ -4275,6 +4246,5 @@ QUrl QUrl::fromUserInput(const QString &userInput) return QUrl(); } -// end of BSD code QT_END_NAMESPACE |