Merge branch 'master' into refactor

Conflicts:
	examples/testapp/testapp.pro
	installerbuilder/installerbase/installerbasecommons.cpp
	installerbuilder/libinstaller/qinstaller.cpp
	installerbuilder/tests/tests.pro

3 files changed, 17 insertions, 8 deletions

diff --git a/installerbuilder/common/installersettings.cpp b/installerbuilder/common/installersettings.cpp
index 7f104c4f6..19f3eeb25 100644
--- a/installerbuilder/common/installersettings.cpp
+++ b/installerbuilder/common/installersettings.cpp
@@ -68,6 +68,7 @@ public:
     QString targetDir;
     QString adminTargetDir;
     QString icon;
+    QString removeTargetDir;
     QString uninstallerName;
     QString uninstallerIniFile;
     QString configurationFileName;
@@ -163,6 +164,7 @@ InstallerSettings InstallerSettings::fromFileAndPrefix( const QString& path, con
     s.d->targetDir = readChild( root, QLatin1String("TargetDir") );
     s.d->adminTargetDir = readChild( root, QLatin1String("AdminTargetDir") );
     s.d->icon = readChild( root, QLatin1String( "Icon" ) );
+    s.d->removeTargetDir = readChild(root, QLatin1String("RemoveTargetDir"), QLatin1String("true"));
     s.d->uninstallerName = readChild( root, QLatin1String( "UninstallerName" ), QLatin1String("uninstall") );
     s.d->uninstallerIniFile = readChild( root, QLatin1String("UninstallerIniFile"), s.d->uninstallerName + QLatin1String(".ini") );
     s.d->privateKey = splitTrimmed( readChild( root, QLatin1String( "PrivateKey" ) ) ).toLatin1();
@@ -256,6 +258,11 @@ QString InstallerSettings::icon() const
 #endif
 }
 
+QString InstallerSettings::removeTargetDir() const
+{
+    return d->removeTargetDir;
+}
+
 QString InstallerSettings::uninstallerName() const
 {
     if( d->uninstallerName.isEmpty() )
diff --git a/installerbuilder/common/installersettings.h b/installerbuilder/common/installersettings.h
index d73049345..939d35f00 100644
--- a/installerbuilder/common/installersettings.h
+++ b/installerbuilder/common/installersettings.h
@@ -70,6 +70,7 @@ namespace QInstaller {
         QString targetDir() const;
         QString adminTargetDir() const;
 
+        QString removeTargetDir() const;
         QString uninstallerName() const;
         QString uninstallerIniFile() const;
 
diff --git a/installerbuilder/common/utils.cpp b/installerbuilder/common/utils.cpp
index 31d92f6be..e4460bd4c 100644
--- a/installerbuilder/common/utils.cpp
+++ b/installerbuilder/common/utils.cpp
@@ -192,14 +192,15 @@ QInstaller::VerboseWriter::~VerboseWriter()
         return;
     }
     QFile output(logFileName);
-    if (!output.open(QIODevice::ReadWrite | QIODevice::Append))
-        qFatal("Could not open logfile!");
-    QString logInfo;
-    logInfo += QLatin1String("*************************************");
-    logInfo += QString::fromLatin1("Invoked:") + QDateTime::currentDateTime().toString();
-    output.write(logInfo.toLocal8Bit());
-    output.write(preFileBuffer.data());
-    output.close();
+    if (output.open(QIODevice::ReadWrite | QIODevice::Append)) {
+        QString logInfo;
+        logInfo += QLatin1String("*************************************");
+        logInfo += QString::fromLatin1("Invoked:") + QDateTime::currentDateTime().toString();
+        output.write(logInfo.toLocal8Bit());
+        output.write(preFileBuffer.data());
+        output.close();
+    }
+    stream.setDevice(0);
 }
 
 void QInstaller::VerboseWriter::setOutputStream(const QString &fileName)