Sfoglia il codice sorgente

macdeployqt: Adjust minimum version based on our Qt #5932

Markus Goetz 7 anni fa
parent
commit
0d182280c4
2 ha cambiato i file con 8 aggiunte e 3 eliminazioni
  1. 7 0
      admin/osx/macdeployqt.py
  2. 1 3
      cmake/modules/MacOSXBundleInfo.plist.in

+ 7 - 0
admin/osx/macdeployqt.py

@@ -337,6 +337,13 @@ for binary in binaries:
 for plugin in QT_PLUGINS:
 for plugin in QT_PLUGINS:
   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
 
 
+if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
+  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
+  commands.append(args)
+else:
+  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
+  commands.append(args)
+
 if len(sys.argv) <= 2:
 if len(sys.argv) <= 2:
   print 'Will run %d commands:' % len(commands)
   print 'Will run %d commands:' % len(commands)
   for command in commands:
   for command in commands:

+ 1 - 3
cmake/modules/MacOSXBundleInfo.plist.in

@@ -27,11 +27,9 @@
         <key>CFBundleShortVersionString</key>
         <key>CFBundleShortVersionString</key>
         <string>@MIRALL_VERSION_STRING@</string>
         <string>@MIRALL_VERSION_STRING@</string>
         <key>NSHumanReadableCopyright</key>
         <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2016 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2018 @APPLICATION_VENDOR@</string>
         <key>SUShowReleaseNotes</key>
         <key>SUShowReleaseNotes</key>
         <false/>
         <false/>
-        <key>LSMinimumBundleVersion</key>
-        <string>10.7.0</string>
         <key>SUPublicDSAKeyFile</key>
         <key>SUPublicDSAKeyFile</key>
         <string>dsa_pub.pem</string>
         <string>dsa_pub.pem</string>
 </dict>
 </dict>