Merge remote-tracking branch 'origin/4.11'

 Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp

Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8

1 files changed, 3 insertions, 9 deletions

diff --git a/src/libs/utils/differ.cpp b/src/libs/utils/differ.cpp
index 16fc0ced01..74ec99c78c 100644
--- a/src/libs/utils/differ.cpp
+++ b/src/libs/utils/differ.cpp
@@ -236,16 +236,12 @@ static int cleanupSemanticsScore(const QString &text1, const QString &text2)
 
 static bool isWhitespace(const QChar &c)
 {
-    if (c == ' ' || c == '\t')
-        return true;
-    return false;
+    return c == ' ' || c == '\t';
 }
 
 static bool isNewLine(const QChar &c)
 {
-    if (c == '\n')
-        return true;
-    return false;
+    return c == '\n';
 }
 
 /*
@@ -719,9 +715,7 @@ static bool diffWithWhitespaceExpandedInEqualities(const QList<Diff> &leftInput,
         return false;
     *rightOutput = decodeExpandedWhitespace(rightDiffList,
                                             commonRightCodeMap, &ok);
-    if (!ok)
-        return false;
-    return true;
+    return ok;
 }
 
 static void appendWithEqualitiesSquashed(const QList<Diff> &leftInput,