Browse Source

Merge branch 'revert-macos-hidpi-qt-dialog' into release-3.9

Merge-request: !1167
Brad King 8 years ago
parent
commit
3f17ccce1c
2 changed files with 7 additions and 7 deletions
  1. 7 3
      Help/release/3.9.rst
  2. 0 4
      Modules/MacOSXBundleInfo.plist.in

+ 7 - 3
Help/release/3.9.rst

@@ -310,9 +310,6 @@ Other Changes
   in dependent targets may now compile without waiting for their targets'
   in dependent targets may now compile without waiting for their targets'
   dependencies to link.
   dependencies to link.
 
 
-* On macOS, the default application bundle ``Info.plist`` file now enables
-  Hi-DPI support.
-
 * On macOS, ``RPATH`` settings such as :prop_tgt:`BUILD_WITH_INSTALL_RPATH`
 * On macOS, ``RPATH`` settings such as :prop_tgt:`BUILD_WITH_INSTALL_RPATH`
   no longer affect the ``install_name`` field.  See policy :policy:`CMP0068`.
   no longer affect the ``install_name`` field.  See policy :policy:`CMP0068`.
 
 
@@ -333,3 +330,10 @@ Changes made since CMake 3.9.0 include the following.
   CMake 3.9.0 has been removed for the 3.9 series due to regressions
   CMake 3.9.0 has been removed for the 3.9 series due to regressions
   caused by new use of ``<PackageName>_ROOT`` variables.  The behavior
   caused by new use of ``<PackageName>_ROOT`` variables.  The behavior
   may be re-introduced in the future in a more-compatible way.
   may be re-introduced in the future in a more-compatible way.
+
+3.9.2
+-----
+
+* On macOS, the default application bundle ``Info.plist`` file no longer
+  enables Hi-DPI support as it did in 3.9.0 and 3.9.1.  The change had
+  to be reverted because it broke iOS applications.

+ 0 - 4
Modules/MacOSXBundleInfo.plist.in

@@ -30,9 +30,5 @@
 	<true/>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSHighResolutionCapable</key>
-	<string>True</string>
 </dict>
 </dict>
 </plist>
 </plist>