From e440b35bb34023998f62fd426987c23bd5983f46 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 31 Jul 2013 10:37:31 -0400 Subject: [PATCH] Update Info.plist templates to use the current standard plist format. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the version number to 1.0, and use the public doctype. Change-Id: I9b071c80c410c31c38813c4447edd7b186226fab Reviewed-by: Jake Petroules Reviewed-by: Tor Arne Vestbø --- mkspecs/macx-clang-32/Info.plist.app | 4 +-- mkspecs/macx-clang-32/Info.plist.lib | 10 +++---- mkspecs/macx-clang/Info.plist.app | 4 +-- mkspecs/macx-clang/Info.plist.lib | 10 +++---- mkspecs/macx-g++-32/Info.plist.app | 4 +-- mkspecs/macx-g++-32/Info.plist.lib | 10 +++---- mkspecs/macx-g++/Info.plist.app | 4 +-- mkspecs/macx-g++/Info.plist.lib | 10 +++---- mkspecs/macx-g++40/Info.plist.app | 4 +-- mkspecs/macx-g++40/Info.plist.lib | 10 +++---- mkspecs/macx-g++42/Info.plist.app | 4 +-- mkspecs/macx-g++42/Info.plist.lib | 10 +++---- mkspecs/macx-llvm/Info.plist.app | 4 +-- mkspecs/macx-llvm/Info.plist.lib | 10 +++---- mkspecs/macx-xcode/Info.plist.app | 4 +-- mkspecs/macx-xcode/Info.plist.lib | 10 +++---- .../unsupported/macx-ios-clang/Info.plist.app | 4 +-- .../unsupported/macx-ios-clang/Info.plist.lib | 10 +++---- tests/auto/other/macplist/tst_macplist.cpp | 30 +++++++++---------- 19 files changed, 78 insertions(+), 78 deletions(-) diff --git a/mkspecs/macx-clang-32/Info.plist.app b/mkspecs/macx-clang-32/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-clang-32/Info.plist.app +++ b/mkspecs/macx-clang-32/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-clang-32/Info.plist.lib b/mkspecs/macx-clang-32/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-clang-32/Info.plist.lib +++ b/mkspecs/macx-clang-32/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-clang/Info.plist.app +++ b/mkspecs/macx-clang/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-clang/Info.plist.lib +++ b/mkspecs/macx-clang/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++-32/Info.plist.app b/mkspecs/macx-g++-32/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++-32/Info.plist.app +++ b/mkspecs/macx-g++-32/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++-32/Info.plist.lib b/mkspecs/macx-g++-32/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++-32/Info.plist.lib +++ b/mkspecs/macx-g++-32/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++/Info.plist.app b/mkspecs/macx-g++/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++/Info.plist.app +++ b/mkspecs/macx-g++/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++/Info.plist.lib b/mkspecs/macx-g++/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++/Info.plist.lib +++ b/mkspecs/macx-g++/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++40/Info.plist.app b/mkspecs/macx-g++40/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++40/Info.plist.app +++ b/mkspecs/macx-g++40/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++40/Info.plist.lib b/mkspecs/macx-g++40/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++40/Info.plist.lib +++ b/mkspecs/macx-g++40/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++42/Info.plist.app b/mkspecs/macx-g++42/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++42/Info.plist.app +++ b/mkspecs/macx-g++42/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++42/Info.plist.lib b/mkspecs/macx-g++42/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++42/Info.plist.lib +++ b/mkspecs/macx-g++42/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-llvm/Info.plist.app b/mkspecs/macx-llvm/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-llvm/Info.plist.app +++ b/mkspecs/macx-llvm/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-llvm/Info.plist.lib b/mkspecs/macx-llvm/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-llvm/Info.plist.lib +++ b/mkspecs/macx-llvm/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-xcode/Info.plist.app b/mkspecs/macx-xcode/Info.plist.app index b822c2851f..187a8e0aa4 100755 --- a/mkspecs/macx-xcode/Info.plist.app +++ b/mkspecs/macx-xcode/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-xcode/Info.plist.lib b/mkspecs/macx-xcode/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-xcode/Info.plist.lib +++ b/mkspecs/macx-xcode/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.app b/mkspecs/unsupported/macx-ios-clang/Info.plist.app index c7d660b8d1..91f4b3d07e 100755 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.app +++ b/mkspecs/unsupported/macx-ios-clang/Info.plist.app @@ -1,6 +1,6 @@ - - + + CFBundleIconFile @ICON@ diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib b/mkspecs/unsupported/macx-ios-clang/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib +++ b/mkspecs/unsupported/macx-ios-clang/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/tests/auto/other/macplist/tst_macplist.cpp b/tests/auto/other/macplist/tst_macplist.cpp index 5ce72bac53..1f0a572ce8 100644 --- a/tests/auto/other/macplist/tst_macplist.cpp +++ b/tests/auto/other/macplist/tst_macplist.cpp @@ -65,14 +65,14 @@ void tst_MacPlist::test_plist_data() QTest::newRow("control") << QString::fromLatin1( "" -"\n" -"\n" +"\n" +"\n" "\n" " CFBundleIconFile\n" " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" +" CFBundleGetInfoString\n" " Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" @@ -83,14 +83,14 @@ void tst_MacPlist::test_plist_data() QTest::newRow("LSUIElement-as-string") << QString::fromLatin1( "" -"\n" -"\n" +"\n" +"\n" "\n" " CFBundleIconFile\n" " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" +" CFBundleGetInfoString\n" " Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" @@ -103,14 +103,14 @@ void tst_MacPlist::test_plist_data() QTest::newRow("LSUIElement-as-bool") << QString::fromLatin1( "" -"\n" -"\n" +"\n" +"\n" "\n" " CFBundleIconFile\n" " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" +" CFBundleGetInfoString\n" " Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" @@ -123,14 +123,14 @@ void tst_MacPlist::test_plist_data() QTest::newRow("LSUIElement-as-int") << QString::fromLatin1( "" -"\n" -"\n" +"\n" +"\n" "\n" " CFBundleIconFile\n" " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" +" CFBundleGetInfoString\n" " Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" @@ -143,14 +143,14 @@ void tst_MacPlist::test_plist_data() QTest::newRow("LSUIElement-as-garbage") << QString::fromLatin1( "" -"\n" -"\n" +"\n" +"\n" "\n" " CFBundleIconFile\n" " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" +" CFBundleGetInfoString\n" " Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n"