Merge remote-tracking branch 'review/master'

4 files changed, 5 insertions, 5 deletions

diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp
index 1a9a6ab..156f1de 100644
--- a/tools/macdeployqt/shared/shared.cpp
+++ b/tools/macdeployqt/shared/shared.cpp
@@ -127,7 +127,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, bool useDebugLibs)
     while (part < parts.count()) {
         const QString currentPart = parts.at(part).simplified() ;
         ++part;
-        if (currentPart == "")
+        if (currentPart.isEmpty())
             continue;
 
         if (state == QtPath) {
diff --git a/tools/macdeployqt/tests/tst_deployment_mac.cpp b/tools/macdeployqt/tests/tst_deployment_mac.cpp
index 858dc45..5921199 100644
--- a/tools/macdeployqt/tests/tst_deployment_mac.cpp
+++ b/tools/macdeployqt/tests/tst_deployment_mac.cpp
@@ -230,4 +230,4 @@ void tst_deployment_mac::testFindAppBinarty()
 
 QTEST_MAIN(tst_deployment_mac)
 
-#include "tst_deployment_mac.moc"
\ No newline at end of file
+#include "tst_deployment_mac.moc"
diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
index b8436b9..c81fe97 100644
--- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
+++ b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
@@ -134,7 +134,7 @@ const Compound operator+(const Item &a, const char * const text)
 
 const Compound operator+(const char * const text, const Item &b)
 {
-    return Compound(Text(text), b);    
+    return Compound(Text(text), b);
 }
 
-}
\ No newline at end of file
+}
diff --git a/tools/qtestlib/wince/cetest/deployment.h b/tools/qtestlib/wince/cetest/deployment.h
index f3645e0..a5ef32d 100644
--- a/tools/qtestlib/wince/cetest/deployment.h
+++ b/tools/qtestlib/wince/cetest/deployment.h
@@ -72,4 +72,4 @@ private:
 
 inline void DeploymentHandler::setConnection(AbstractRemoteConnection *connection) { m_connection = connection; }
 inline AbstractRemoteConnection* DeploymentHandler::connection() const { return m_connection; }
-#endif
\ No newline at end of file
+#endif