Merge remote-tracking branch 'origin/4.2' into 4.3

 Conflicts:
	doc/src/qtcreator.qdoc
	tests/system/suite_general/suite.conf

Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a

2 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 7cac510c11..3a34747838 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -160,10 +160,13 @@ Command ArtisticStyle::command(const QString &cfgFile) const
     command.addOption("-q");
     command.addOption("--options=" + cfgFile);
 
-    if (m_settings->version() > ArtisticStyleSettings::Version_2_03) {
+    const int version = m_settings->version();
+    if (version > ArtisticStyleSettings::Version_2_03) {
         command.setProcessing(Command::PipeProcessing);
-        command.setPipeAddsNewline(true);
+        if (version == ArtisticStyleSettings::Version_2_04)
+            command.setPipeAddsNewline(true);
         command.setReturnsCRLF(Utils::HostOsInfo::isWindowsHost());
+        command.addOption("-z2");
     } else {
         command.addOption("%file");
     }
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
index 6ae9d9a37b..3f5cd4cc17 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
@@ -40,7 +40,8 @@ class ArtisticStyleSettings : public AbstractSettings
 
 public:
     enum ArtisticStyleVersion {
-        Version_2_03 = 203
+        Version_2_03 = 203,
+        Version_2_04 = 204
     };
 
     ArtisticStyleSettings();