Merge 2.2 into master

Change-Id: I1fd1798934066b081d8f29bf33c5d18ddd8a8838

3 files changed, 59 insertions, 4 deletions

diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs
index ff77afbe0..b3d39fe27 100644
--- a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs
+++ b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs
@@ -63,9 +63,9 @@ Project {
         name: "custom-buttons"
 
         Group {
-            files: ["de_DE.lproj/eula.txt"]
-            dmg.licenseLocale: "sv_SE" // override auto-detected de_DE with sv_SE
-            dmg.licenseLanguageName: "Swedish, not Deutsch"
+            files: ["ru_RU.lproj/eula.txt"]
+            dmg.licenseLocale: "sv_SE" // override auto-detected ru_RU with sv_SE
+            dmg.licenseLanguageName: "Swedish, not Russian"
             dmg.licenseAgreeButtonText: "Of course"
             dmg.licenseDisagreeButtonText: "Never!"
             dmg.licensePrintButtonText: "Make Paper"
@@ -75,7 +75,7 @@ Project {
 
         Group {
             files: ["*.lproj/**"]
-            excludeFiles: ["de_DE.lproj/eula.txt"]
+            excludeFiles: ["ru_RU.lproj/eula.txt"]
         }
     }
 }
diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/ko_KR.lproj/eula.rtf b/tests/auto/blackbox/testdata-apple/apple-dmg/ko_KR.lproj/eula.rtf
new file mode 100644
index 000000000..5b7c49d56
--- /dev/null
+++ b/tests/auto/blackbox/testdata-apple/apple-dmg/ko_KR.lproj/eula.rtf
@@ -0,0 +1,49 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265
+{\fonttbl\f0\fnil\fcharset129 AppleSDGothicNeo-Regular;\f1\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+
+\f0\b\fs24 \cf0 \'c7\'e3\'b1\'b8
+\f1  CORPORATION\
+
+\f0 \'bc\'d2\'c7\'c1\'c6\'ae\'bf\'fe\'be\'ee
+\f1  
+\f0 \'bf\'b9
+\f1  
+\f0 \'b0\'e8\'be\'e0
+\f1\b0 \
+\
+
+\f0 \'b4\'e7\'bd\'c5\'c0\'ba
+\f1  
+\f0 \'b4\'e7\'bd\'c5\'c0\'cc
+\f1  
+\f0 \'c7\'d9\'b9\'ab\'b1\'e2\'b8\'a6
+\f1  
+\f0 \'b8\'b8\'b5\'e9\'b1\'e2
+\f1  
+\f0 \'c0\'a7\'c7\'d8\'c0\'cc
+\f1  
+\f0 \'c0\'c0\'bf\'eb
+\f1  
+\f0 \'c7\'c1\'b7\'ce\'b1\'d7\'b7\'a5\'c0\'bb
+\f1  
+\f0 \'bb\'e7\'bf\'eb\'c7\'cf\'c1\'f6
+\f1  
+\f0 \'be\'ca\'c0\'bb
+\f1  
+\f0 \'b0\'cd\'bf\'a1
+\f1  
+\f0 \'b5\'bf\'c0\'c7\'c7\'d5\'b4\'cf\'b4\'d9
+\f1 .\
+\
+
+\f0 \'b4\'e7\'bd\'c5\'c0\'ba
+\f1  QBS
+\f0 \'b0\'a1
+\f1  
+\f0 \'c3\'d6\'b0\'ed\'b6\'f3\'b0\'ed
+\f1  
+\f0 \'b5\'bf\'c0\'c7\'c7\'d5\'b4\'cf\'b4\'d9
+\f1 .}
\ No newline at end of file
diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/ru_RU.lproj/eula.txt b/tests/auto/blackbox/testdata-apple/apple-dmg/ru_RU.lproj/eula.txt
new file mode 100644
index 000000000..e2b7adbed
--- /dev/null
+++ b/tests/auto/blackbox/testdata-apple/apple-dmg/ru_RU.lproj/eula.txt
@@ -0,0 +1,6 @@
+FICTIONAL CORPORATION
+SOFTWARE EXAMPLE AGREEMENT
+
+You agree that you will not use this app to make nuclear weapons.
+
+You agree that Qbs is the best.