Small cosmetical changes, no functional.

Change-Id: Ic984503444187dfcfcfa83f82768bebb329381d0
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>

5 files changed, 5 insertions, 6 deletions

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 8e03178ac..e65e3aea7 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -177,7 +177,6 @@ static void deferredRename(const QString &oldName, const QString &newName, bool
 }
 
 
-
 // -- PackageManagerCorePrivate
 
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index ee92c3b1a..55a25f9a8 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -40,7 +40,6 @@
 #include "packagemanagercoredata.h"
 #include "packagemanagerproxyfactory.h"
 #include "qinstallerglobal.h"
-#include "remotefileengine.h"
 
 #include "kdsysinfo.h"
 #include "kdupdaterapplication.h"
@@ -51,6 +50,7 @@
 class KDJob;
 
 QT_FORWARD_DECLARE_CLASS(QFile)
+QT_FORWARD_DECLARE_CLASS(QFileDevice)
 QT_FORWARD_DECLARE_CLASS(QFileInfo)
 
 using namespace KDUpdater;
@@ -64,6 +64,7 @@ class ComponentModel;
 class TempDirDeleter;
 class InstallerCalculator;
 class UninstallerCalculator;
+class RemoteFileEngineHandler;
 
 /*
     The default configuration interface implementation does call QSettings to save files for later deletion,
diff --git a/src/sdk/commandlineparser.cpp b/src/sdk/commandlineparser.cpp
index 1a242bdda..23d903bd3 100644
--- a/src/sdk/commandlineparser.cpp
+++ b/src/sdk/commandlineparser.cpp
@@ -71,7 +71,7 @@ CommandLineParser::CommandLineParser()
         QLatin1String("Start application in package manager mode.")));
 
     m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::NoForceInstallation),
-        QLatin1String("Allow deselection of components that are marked as forced.")));
+        QLatin1String("Allow deselecting components that are marked as forced.")));
 
     m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::ShowVirtualComponents),
         QLatin1String("Show virtual components in installer and package manager.")));
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index d351233cb..5b6019c74 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -107,12 +107,11 @@ int main(int argc, char *argv[])
             return EXIT_SUCCESS;
         }
 
+        std::cout << qPrintable(parser.helpText()) << std::endl;
         if (mutually.count() > 1) {
             std::cerr << qPrintable(QString::fromLatin1("The following options are mutually "
                 "exclusive: %1.").arg(mutually.join(QLatin1String(", ")))) << std::endl;
         }
-
-        std::cout << qPrintable(parser.helpText()) << std::endl;
         return help ? EXIT_SUCCESS : EXIT_FAILURE;
     }
 
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index 7f5ef0eb1..ea11a3405 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -725,7 +725,7 @@ int main(int argc, char **argv)
             confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly);
         }
 
-#if defined(Q_OS_OSX)
+#ifdef Q_OS_OSX
         // on mac, we enforce building a bundle
         if (!target.endsWith(QLatin1String(".app")) && !target.endsWith(QLatin1String(".dmg")))
             target += QLatin1String(".app");