<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e60744bf4b2421b8065e51631bab67f852a01e47">https://github.com/macports/macports-ports/commit/e60744bf4b2421b8065e51631bab67f852a01e47</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e60744b qt4-mac: Fix building using MacPorts Clang 5.0 compiler
</span>e60744b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e60744bf4b2421b8065e51631bab67f852a01e47
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Mar 12 09:24:20 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt4-mac: Fix building using MacPorts Clang 5.0 compiler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also add other patches from NiXos archive.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55932
</span>---
aqua/qt4-mac/Portfile | 34 +++++++++++-
aqua/qt4-mac/files/patch-allow_libressl.diff | 63 ++++++++++++++++++++++
.../files/patch-parallelize_qmake_build.diff | 29 ++++++++++
.../patch-qmake_generators_unix_unixmake.cpp.diff | 11 ++++
.../files/patch-src_corelib_io_qsettings.cpp.diff | 11 ++++
...patch-src_gui_text_qfontengine_coretext.mm.diff | 11 ++++
6 files changed, 157 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6bee3e..03f4767 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name qt4-mac
version 4.8.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,6 +315,35 @@ patchfiles-append patch-qthread-stacksize.diff
</span>
patchfiles-append patch-qt-custom-threadpool.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# (34) Various from NiXos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see also < https://trac.macports.org/ticket/55932 >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and < https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/libraries/qt-4.x/4.8 >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (a) allow use of libressl as well as openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-allow_libressl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (b) allow parallel qmake building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# normally qmake is built using a single thread / job
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-parallelize_qmake_build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (c) fix unix makefile generation to augment this specific variable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ('ret'), not overwrite it -- this matches the other uses of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# specific variable in that area, especially that in the 'if' statement.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qmake_generators_unix_unixmake.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (d) fix to not call qsettings before constructing a qapplication,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# because it causes a dead-lock.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src_corelib_io_qsettings.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (e) fix to properly use QFixed as a type rather than a constructor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (I think). Without this fix, the build errors out on Clang 5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src_gui_text_qfontengine_coretext.mm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # error out if trying to build on a new OSX version (> 10.12).
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -565,7 +594,8 @@ configure.args \
</span> -no-pch \
-framework \
-no-phonon \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-phonon-backend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-phonon-backend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --jobs=${build.jobs}
</span>
# Stop configure script from searching for SQL Drivers
# not available from MacPorts.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-allow_libressl.diff b/aqua/qt4-mac/files/patch-allow_libressl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..600a18d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-allow_libressl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,63 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,13 +228,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -822,13 +826,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(SSLv2_client_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(SSLv3_client_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(SSLv23_client_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(TLSv1_client_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(SSLv2_server_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(SSLv3_server_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(SSLv23_server_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(TLSv1_server_method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOLVEFUNC(X509_NAME_entry_count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/network/ssl/qsslsocket_openssl.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/network/ssl/qsslsocket_openssl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,15 +267,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QSsl::SslV3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case QSsl::SecureProtocols: // SslV2 will be disabled below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case QSsl::TlsV1SslV3: // SslV2 will be disabled below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QSsl::AnyProtocol:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QSsl::TlsV1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case QSsl::SecureProtocols:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case QSsl::TlsV1SslV3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-parallelize_qmake_build.diff b/aqua/qt4-mac/files/patch-parallelize_qmake_build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bf16242
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-parallelize_qmake_build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configurel.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1087,6 +1087,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # parse command line arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++JOBS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # parse the arguments, setting things to "yes" or "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while [ "$#" -gt 0 ]; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2538,6 +2539,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNKNOWN_OPT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ jobs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JOBS=-j$VAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNKNOWN_OPT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5137,7 +5141,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_BUILD_ERROR=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd "$outpath/qmake"; "$MAKE" $JOBS) || QMAKE_BUILD_ERROR=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qmake_generators_unix_unixmake.cpp.diff b/aqua/qt4-mac/files/patch-qmake_generators_unix_unixmake.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a15583f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qmake_generators_unix_unixmake.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/generators/unix/unixmake.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/generators/unix/unixmake.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -951,7 +951,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret += " " + var("QMAKE_STRIPFLAGS_APP");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(bundle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret += " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret += " \"" + dst_targ + "\"";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_corelib_io_qsettings.cpp.diff b/aqua/qt4-mac/files/patch-src_corelib_io_qsettings.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9ddf725
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_corelib_io_qsettings.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/io/qsettings.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/io/qsettings.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,7 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_GLOBAL_STATIC(PathHash, pathHashFunc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Q_GLOBAL_STATIC(QMutex, globalMutex)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static QSettings::Format globalDefaultFormat = QSettings::NativeFormat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef Q_OS_WIN
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_text_qfontengine_coretext.mm.diff b/aqua/qt4-mac/files/patch-src_gui_text_qfontengine_coretext.mm.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b43a14a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_text_qfontengine_coretext.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/text/qfontengine_coretext.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/text/qfontengine_coretext.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -886,7 +886,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFixed QCoreTextFontEngine::emSquareSize() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
</span></pre><pre style='margin:0'>
</pre>