Merge branch 'master' into refactor

Conflicts:
	installerbuilder/libinstaller/macrelocateqt.cpp
	installerbuilder/libinstaller/macreplaceinstallnamesoperation.cpp

1 files changed, 8 insertions, 3 deletions

diff --git a/tools/operationrunner/operationrunner.cpp b/tools/operationrunner/operationrunner.cpp
index 623c711c6..b76aed455 100644
--- a/tools/operationrunner/operationrunner.cpp
+++ b/tools/operationrunner/operationrunner.cpp
@@ -107,8 +107,11 @@ int main(int argc, char **argv)
 
         QInstaller::init();
 
+        QInstaller::VerboseWriter::instance();
+
         QInstaller::setVerbose( true );
 
+
         QString operationName = argumentList.takeFirst();
         KDUpdater::UpdateOperation* const operation = KDUpdater::UpdateOperationFactory::instance().create(operationName);
         if (!operation) {
@@ -127,10 +130,12 @@ int main(int argc, char **argv)
         }
 
         FakeInstaller fakeInstaller;
-        fakeInstaller.setTargetDir(sdkTargetDir);
+        if (!sdkTargetDir.isEmpty()) {
+            fakeInstaller.setTargetDir(sdkTargetDir);
 
-        operation->setValue(QLatin1String("installer"),
-            QVariant::fromValue(static_cast<QInstaller::Installer*>(&fakeInstaller)));
+            operation->setValue(QLatin1String("installer"),
+                QVariant::fromValue(static_cast<QInstaller::Installer*>(&fakeInstaller)));
+        }
 
         operation->setArguments(argumentList);