1 files changed, 54 insertions, 7 deletions

diff --git a/src/corelib/tools/qstring_compat.cpp b/src/corelib/tools/qstring_compat.cpp
index c776092569..5c4f24b8f4 100644
--- a/src/corelib/tools/qstring_compat.cpp
+++ b/src/corelib/tools/qstring_compat.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Intel Corporation
-** Contact: http://www.qt-project.org/legal
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,24 +23,50 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
-#if defined(QSTRING_H)
+#if defined(QSTRING_H) || defined(QBYTEARRAY_H)
 #  error "This file cannot be compiled with pre-compiled headers"
 #endif
 #define QT_COMPILING_QSTRING_COMPAT_CPP
 
+#include "qbytearray.h"
 #include "qstring.h"
 
 QT_BEGIN_NAMESPACE
 
 // all these implementations must be the same as the inline versions in qstring.h
+QString QString::trimmed() const
+{
+    return trimmed_helper(*this);
+}
+
+QString QString::simplified() const
+{
+    return simplified_helper(*this);
+}
+
+QString QString::toLower() const
+{
+    return toLower_helper(*this);
+}
+
+QString QString::toCaseFolded() const
+{
+    return toCaseFolded_helper(*this);
+}
+
+QString QString::toUpper() const
+{
+    return toUpper_helper(*this);
+}
+
 QByteArray QString::toLatin1() const
 {
     return toLatin1_helper(*this);
@@ -56,4 +82,25 @@ QByteArray QString::toUtf8() const
     return toUtf8_helper(*this);
 }
 
+// ditto, for qbytearray.h (because we're lazy)
+QByteArray QByteArray::toLower() const
+{
+    return toLower_helper(*this);
+}
+
+QByteArray QByteArray::toUpper() const
+{
+    return toUpper_helper(*this);
+}
+
+QByteArray QByteArray::trimmed() const
+{
+    return trimmed_helper(*this);
+}
+
+QByteArray QByteArray::simplified() const
+{
+    return simplified_helper(*this);
+}
+
 QT_END_NAMESPACE