diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/binarycreator/binarycreator.cpp | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index b9497f533..361dbd3fa 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -154,34 +154,34 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt infoPList.open(QIODevice::WriteOnly); QTextStream plistStream(&infoPList); plistStream << QLatin1String("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") << endl; - plistStream << QLatin1String("<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs" - "/PropertyList.dtd\">") << endl; - plistStream << QLatin1String("<plist version=\"0.9\">") << endl; + plistStream << QLatin1String("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" " + "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">") << endl; + plistStream << QLatin1String("<plist version=\"1.0\">") << endl; plistStream << QLatin1String("<dict>") << endl; - plistStream << QLatin1String(" <key>CFBundleIconFile</key>") << endl; - plistStream << QLatin1String(" <string>") << iconTargetFile << QLatin1String("</string>") + plistStream << QLatin1String("\t<key>CFBundleIconFile</key>") << endl; + plistStream << QLatin1String("\t<string>") << iconTargetFile << QLatin1String("</string>") << endl; - plistStream << QLatin1String(" <key>CFBundlePackageType</key>") << endl; - plistStream << QLatin1String(" <string>APPL</string>") << endl; - plistStream << QLatin1String(" <key>CFBundleGetInfoString</key>") << endl; + plistStream << QLatin1String("\t<key>CFBundlePackageType</key>") << endl; + plistStream << QLatin1String("\t<string>APPL</string>") << endl; + plistStream << QLatin1String("\t<key>CFBundleGetInfoString</key>") << endl; #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) - plistStream << QLatin1String(" <string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>") + plistStream << QLatin1String("\t<string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>") << endl; #undef QUOTE #undef QUOTE_ - plistStream << QLatin1String(" <key>CFBundleSignature</key>") << endl; - plistStream << QLatin1String(" <string> ???? </string>") << endl; - plistStream << QLatin1String(" <key>CFBundleExecutable</key>") << endl; - plistStream << QLatin1String(" <string>") << fi.completeBaseName() << QLatin1String("</string>") + plistStream << QLatin1String("\t<key>CFBundleSignature</key>") << endl; + plistStream << QLatin1String("\t<string>\?\?\?\?</string>") << endl; + plistStream << QLatin1String("\t<key>CFBundleExecutable</key>") << endl; + plistStream << QLatin1String("\t<string>") << fi.completeBaseName() << QLatin1String("</string>") << endl; - plistStream << QLatin1String(" <key>CFBundleIdentifier</key>") << endl; - plistStream << QLatin1String(" <string>com.yourcompany.installerbase</string>") << endl; - plistStream << QLatin1String(" <key>NOTE</key>") << endl; - plistStream << QLatin1String(" <string>This file was generated by Qt Installer Framework.</string>") + plistStream << QLatin1String("\t<key>CFBundleIdentifier</key>") << endl; + plistStream << QLatin1String("\t<string>com.yourcompany.installerbase</string>") << endl; + plistStream << QLatin1String("\t<key>NOTE</key>") << endl; + plistStream << QLatin1String("\t<string>This file was generated by Qt Installer Framework.</string>") << endl; - plistStream << QLatin1String(" <key>NSPrincipalClass</key>") << endl; - plistStream << QLatin1String(" <string>NSApplication</string>") << endl; + plistStream << QLatin1String("\t<key>NSPrincipalClass</key>") << endl; + plistStream << QLatin1String("\t<string>NSApplication</string>") << endl; plistStream << QLatin1String("</dict>") << endl; plistStream << QLatin1String("</plist>") << endl; @@ -797,8 +797,11 @@ int main(int argc, char **argv) { QSettings confInternal(tmpMetaDir + QLatin1String("/config/config-internal.ini") , QSettings::IniFormat); - // assume offline installer if there are no repositories - offlineOnly |= settings.repositories().isEmpty(); + // assume offline installer if there are no repositories and no + //--online-only not set + offlineOnly = offlineOnly | settings.repositories().isEmpty(); + if (onlineOnly) + offlineOnly = !onlineOnly; confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly); } |