summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-08-21 09:51:05 -0400
committerBrad King <brad.king@kitware.com>2017-08-22 07:30:20 -0400
commit3f17ccce1cc5b2c307aac866d9fd19aba73fd979 (patch)
tree3f3f3a7716e0e1f6def1abcf2a99a0c0010ae6be
parentf78228dfd56b66d401c2b99f7883a7cebb18ecf7 (diff)
parent286c75f7f034c5fdcd43bcb755da74d09c809642 (diff)
downloadcmake-3f17ccce1cc5b2c307aac866d9fd19aba73fd979.tar.gz
Merge branch 'revert-macos-hidpi-qt-dialog' into release-3.9
Merge-request: !1167
-rw-r--r--Help/release/3.9.rst10
-rw-r--r--Modules/MacOSXBundleInfo.plist.in4
2 files changed, 7 insertions, 7 deletions
diff --git a/Help/release/3.9.rst b/Help/release/3.9.rst
index ae55105c53..5087b4371a 100644
--- a/Help/release/3.9.rst
+++ b/Help/release/3.9.rst
@@ -310,9 +310,6 @@ Other Changes
in dependent targets may now compile without waiting for their targets'
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`
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
caused by new use of ``<PackageName>_ROOT`` variables. The behavior
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.
diff --git a/Modules/MacOSXBundleInfo.plist.in b/Modules/MacOSXBundleInfo.plist.in
index e06b17ecf1..a4009bce32 100644
--- a/Modules/MacOSXBundleInfo.plist.in
+++ b/Modules/MacOSXBundleInfo.plist.in
@@ -30,9 +30,5 @@
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>NSHighResolutionCapable</key>
- <string>True</string>
</dict>
</plist>