diff options
| author | Erwin Jansen <jansene@google.com> | 2018-11-06 12:35:35 -0800 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2018-11-06 19:01:13 -0800 |
| commit | 0578a3b1c0fe6cbf12d53a55a1102701e9322dad (patch) | |
| tree | fbabbf8b68d6d92a3ed3d86fdc6288f0e9047059 | |
| parent | 81c383210cc6cd209be0843d368b0371caf0dc04 (diff) | |
| download | qt-0578a3b1c0fe6cbf12d53a55a1102701e9322dad.tar.gz | |
Update @rpaths to be consistent.
The rpaths were sometimes pointing to libXXX.5.dylib and sometimes to
libXXX.5.11.1.dylib. This can cause issues when the dylibs were not
symlinked (as happens in our gradle build).
We now make sure that we always point to 5.11.1.dylib so we do not
accidently load the same dylib twice causing confusion and other issues.
Bug: b/119071876
Change-Id: I048cf9b00654158d78573dfb2de71822398bebc8
59 files changed, 27 insertions, 0 deletions
diff --git a/darwin-x86_64/fixup.sh b/darwin-x86_64/fixup.sh new file mode 100755 index 00000000..d08b913b --- /dev/null +++ b/darwin-x86_64/fixup.sh @@ -0,0 +1,27 @@ +# This script is used to fixup the version dependencies. +# Previously the Qt5 libs were depending on a symlinked version, which can +# cause version issues in our build. +# +# - It is possible that we load a dylib 2x times, with different versions. +# - When the symlink does not point to the exact version (i.e. 5 -> 5.12) +# - When the symlink is not a symlink +# +# This can cause issues depending on how you build and link. + +SOURCE_VER=5 +DEST_VER=5.11.1 +SED_STR="s/.${SOURCE_VER}.dylib/.${DEST_VER}.dylib/g" +libs=$(find . -name '*.dylib' -type f) +for lib in $libs; do + name=$(basename $lib) + idfix=$(echo $name | sed ${SED_STR}) + echo install_name_tool -id "@rpath/$idfix" $lib + install_name_tool -id "@rpath/$idfix" $lib + tofix=$(otool -L $lib | tail -n +1 | grep 'libQt5' | awk ' { print $1; } ') + for fix in $tofix; do + name=$(basename $fix) + idfix=$(echo $name | sed ${SED_STR}) + echo install_name_tool -change $fix "@rpath/$idfix" $lib + install_name_tool -change $fix "@rpath/$name" $lib + done +done diff --git a/darwin-x86_64/lib/libQt5Concurrent.5.11.1.dylib b/darwin-x86_64/lib/libQt5Concurrent.5.11.1.dylib Binary files differindex 2a69e938..421e325a 100755 --- a/darwin-x86_64/lib/libQt5Concurrent.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Concurrent.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5DBus.5.11.1.dylib b/darwin-x86_64/lib/libQt5DBus.5.11.1.dylib Binary files differindex d4e12d09..79640b48 100755 --- a/darwin-x86_64/lib/libQt5DBus.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5DBus.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Designer.5.11.1.dylib b/darwin-x86_64/lib/libQt5Designer.5.11.1.dylib Binary files differindex 397e8e5c..4556b613 100755 --- a/darwin-x86_64/lib/libQt5Designer.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Designer.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5DesignerComponents.5.11.1.dylib b/darwin-x86_64/lib/libQt5DesignerComponents.5.11.1.dylib Binary files differindex 2e3d0d11..199f45bb 100755 --- a/darwin-x86_64/lib/libQt5DesignerComponents.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5DesignerComponents.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Gui.5.11.1.dylib b/darwin-x86_64/lib/libQt5Gui.5.11.1.dylib Binary files differindex 1c481854..8927f049 100755 --- a/darwin-x86_64/lib/libQt5Gui.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Gui.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Help.5.11.1.dylib b/darwin-x86_64/lib/libQt5Help.5.11.1.dylib Binary files differindex fefef7be..b193d23d 100755 --- a/darwin-x86_64/lib/libQt5Help.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Help.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Network.5.11.1.dylib b/darwin-x86_64/lib/libQt5Network.5.11.1.dylib Binary files differindex 4af0ff42..aaa03491 100755 --- a/darwin-x86_64/lib/libQt5Network.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Network.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5OpenGL.5.11.1.dylib b/darwin-x86_64/lib/libQt5OpenGL.5.11.1.dylib Binary files differindex 6033d525..cac332e2 100755 --- a/darwin-x86_64/lib/libQt5OpenGL.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5OpenGL.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5PrintSupport.5.11.1.dylib b/darwin-x86_64/lib/libQt5PrintSupport.5.11.1.dylib Binary files differindex 96dfeac4..3013e7cb 100755 --- a/darwin-x86_64/lib/libQt5PrintSupport.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5PrintSupport.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Qml.5.11.1.dylib b/darwin-x86_64/lib/libQt5Qml.5.11.1.dylib Binary files differindex 3f645655..f44eb003 100755 --- a/darwin-x86_64/lib/libQt5Qml.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Qml.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Quick.5.11.1.dylib b/darwin-x86_64/lib/libQt5Quick.5.11.1.dylib Binary files differindex 5d9345c5..37d90e07 100755 --- a/darwin-x86_64/lib/libQt5Quick.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Quick.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5QuickParticles.5.11.1.dylib b/darwin-x86_64/lib/libQt5QuickParticles.5.11.1.dylib Binary files differindex fd773b95..4008b417 100755 --- a/darwin-x86_64/lib/libQt5QuickParticles.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5QuickParticles.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5QuickTest.5.11.1.dylib b/darwin-x86_64/lib/libQt5QuickTest.5.11.1.dylib Binary files differindex 886d13f0..f5ea43fb 100755 --- a/darwin-x86_64/lib/libQt5QuickTest.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5QuickTest.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5QuickWidgets.5.11.1.dylib b/darwin-x86_64/lib/libQt5QuickWidgets.5.11.1.dylib Binary files differindex 7ca7bd9b..8d01fd43 100755 --- a/darwin-x86_64/lib/libQt5QuickWidgets.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5QuickWidgets.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Sql.5.11.1.dylib b/darwin-x86_64/lib/libQt5Sql.5.11.1.dylib Binary files differindex 97c9768f..8fdde1ca 100755 --- a/darwin-x86_64/lib/libQt5Sql.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Sql.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Svg.5.11.1.dylib b/darwin-x86_64/lib/libQt5Svg.5.11.1.dylib Binary files differindex 86c73650..339f84c1 100755 --- a/darwin-x86_64/lib/libQt5Svg.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Svg.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Test.5.11.1.dylib b/darwin-x86_64/lib/libQt5Test.5.11.1.dylib Binary files differindex 19ae993a..b8b9bf47 100755 --- a/darwin-x86_64/lib/libQt5Test.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Test.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5WebChannel.5.11.1.dylib b/darwin-x86_64/lib/libQt5WebChannel.5.11.1.dylib Binary files differindex 66268294..dcc646da 100755 --- a/darwin-x86_64/lib/libQt5WebChannel.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5WebChannel.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5WebEngine.5.11.1.dylib b/darwin-x86_64/lib/libQt5WebEngine.5.11.1.dylib Binary files differindex 5c6ee4a5..ea14e9d5 100755 --- a/darwin-x86_64/lib/libQt5WebEngine.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5WebEngine.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5WebEngineCore.5.11.1.dylib b/darwin-x86_64/lib/libQt5WebEngineCore.5.11.1.dylib Binary files differindex 471832ad..901adba1 100755 --- a/darwin-x86_64/lib/libQt5WebEngineCore.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5WebEngineCore.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5WebEngineWidgets.5.11.1.dylib b/darwin-x86_64/lib/libQt5WebEngineWidgets.5.11.1.dylib Binary files differindex fac94762..60d83dd8 100755 --- a/darwin-x86_64/lib/libQt5WebEngineWidgets.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5WebEngineWidgets.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5WebSockets.5.11.1.dylib b/darwin-x86_64/lib/libQt5WebSockets.5.11.1.dylib Binary files differindex 03269dcf..96533f44 100755 --- a/darwin-x86_64/lib/libQt5WebSockets.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5WebSockets.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Widgets.5.11.1.dylib b/darwin-x86_64/lib/libQt5Widgets.5.11.1.dylib Binary files differindex 71df0821..ade9fcc7 100755 --- a/darwin-x86_64/lib/libQt5Widgets.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Widgets.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5Xml.5.11.1.dylib b/darwin-x86_64/lib/libQt5Xml.5.11.1.dylib Binary files differindex fcf94633..1dc663f2 100755 --- a/darwin-x86_64/lib/libQt5Xml.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5Xml.5.11.1.dylib diff --git a/darwin-x86_64/lib/libQt5XmlPatterns.5.11.1.dylib b/darwin-x86_64/lib/libQt5XmlPatterns.5.11.1.dylib Binary files differindex b4a625ca..4cafac4f 100755 --- a/darwin-x86_64/lib/libQt5XmlPatterns.5.11.1.dylib +++ b/darwin-x86_64/lib/libQt5XmlPatterns.5.11.1.dylib diff --git a/darwin-x86_64/plugins/bearer/libqgenericbearer.dylib b/darwin-x86_64/plugins/bearer/libqgenericbearer.dylib Binary files differindex cb171c2f..3afc64ca 100755 --- a/darwin-x86_64/plugins/bearer/libqgenericbearer.dylib +++ b/darwin-x86_64/plugins/bearer/libqgenericbearer.dylib diff --git a/darwin-x86_64/plugins/designer/libqquickwidget.dylib b/darwin-x86_64/plugins/designer/libqquickwidget.dylib Binary files differindex d452754e..e94597f0 100755 --- a/darwin-x86_64/plugins/designer/libqquickwidget.dylib +++ b/darwin-x86_64/plugins/designer/libqquickwidget.dylib diff --git a/darwin-x86_64/plugins/designer/libqwebengineview.dylib b/darwin-x86_64/plugins/designer/libqwebengineview.dylib Binary files differindex 2d50858c..156b5675 100755 --- a/darwin-x86_64/plugins/designer/libqwebengineview.dylib +++ b/darwin-x86_64/plugins/designer/libqwebengineview.dylib diff --git a/darwin-x86_64/plugins/generic/libqtuiotouchplugin.dylib b/darwin-x86_64/plugins/generic/libqtuiotouchplugin.dylib Binary files differindex 3a9eef28..96a6aa45 100755 --- a/darwin-x86_64/plugins/generic/libqtuiotouchplugin.dylib +++ b/darwin-x86_64/plugins/generic/libqtuiotouchplugin.dylib diff --git a/darwin-x86_64/plugins/iconengines/libqsvgicon.dylib b/darwin-x86_64/plugins/iconengines/libqsvgicon.dylib Binary files differindex 1c09ddb5..dbd4dac9 100755 --- a/darwin-x86_64/plugins/iconengines/libqsvgicon.dylib +++ b/darwin-x86_64/plugins/iconengines/libqsvgicon.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqgif.dylib b/darwin-x86_64/plugins/imageformats/libqgif.dylib Binary files differindex 59f537a6..cc8645fa 100755 --- a/darwin-x86_64/plugins/imageformats/libqgif.dylib +++ b/darwin-x86_64/plugins/imageformats/libqgif.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqicns.dylib b/darwin-x86_64/plugins/imageformats/libqicns.dylib Binary files differindex 75704bfc..4f760bab 100755 --- a/darwin-x86_64/plugins/imageformats/libqicns.dylib +++ b/darwin-x86_64/plugins/imageformats/libqicns.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqico.dylib b/darwin-x86_64/plugins/imageformats/libqico.dylib Binary files differindex 69ac9add..c7f28884 100755 --- a/darwin-x86_64/plugins/imageformats/libqico.dylib +++ b/darwin-x86_64/plugins/imageformats/libqico.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqjpeg.dylib b/darwin-x86_64/plugins/imageformats/libqjpeg.dylib Binary files differindex 449905c9..37afc8e6 100755 --- a/darwin-x86_64/plugins/imageformats/libqjpeg.dylib +++ b/darwin-x86_64/plugins/imageformats/libqjpeg.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqmacheif.dylib b/darwin-x86_64/plugins/imageformats/libqmacheif.dylib Binary files differindex 33dc024d..9eb6843f 100755 --- a/darwin-x86_64/plugins/imageformats/libqmacheif.dylib +++ b/darwin-x86_64/plugins/imageformats/libqmacheif.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqmacjp2.dylib b/darwin-x86_64/plugins/imageformats/libqmacjp2.dylib Binary files differindex 13e71b15..28c78fbb 100755 --- a/darwin-x86_64/plugins/imageformats/libqmacjp2.dylib +++ b/darwin-x86_64/plugins/imageformats/libqmacjp2.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqsvg.dylib b/darwin-x86_64/plugins/imageformats/libqsvg.dylib Binary files differindex 1ae2e908..6146befb 100755 --- a/darwin-x86_64/plugins/imageformats/libqsvg.dylib +++ b/darwin-x86_64/plugins/imageformats/libqsvg.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqtga.dylib b/darwin-x86_64/plugins/imageformats/libqtga.dylib Binary files differindex c4fe64c3..38681274 100755 --- a/darwin-x86_64/plugins/imageformats/libqtga.dylib +++ b/darwin-x86_64/plugins/imageformats/libqtga.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqtiff.dylib b/darwin-x86_64/plugins/imageformats/libqtiff.dylib Binary files differindex ab95c3dd..6cd3f235 100755 --- a/darwin-x86_64/plugins/imageformats/libqtiff.dylib +++ b/darwin-x86_64/plugins/imageformats/libqtiff.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqwbmp.dylib b/darwin-x86_64/plugins/imageformats/libqwbmp.dylib Binary files differindex 5b355310..ac4d637f 100755 --- a/darwin-x86_64/plugins/imageformats/libqwbmp.dylib +++ b/darwin-x86_64/plugins/imageformats/libqwbmp.dylib diff --git a/darwin-x86_64/plugins/imageformats/libqwebp.dylib b/darwin-x86_64/plugins/imageformats/libqwebp.dylib Binary files differindex 3cde432e..bf9c1ee3 100755 --- a/darwin-x86_64/plugins/imageformats/libqwebp.dylib +++ b/darwin-x86_64/plugins/imageformats/libqwebp.dylib diff --git a/darwin-x86_64/plugins/platforms/libqcocoa.dylib b/darwin-x86_64/plugins/platforms/libqcocoa.dylib Binary files differindex b077cedd..b017a850 100755 --- a/darwin-x86_64/plugins/platforms/libqcocoa.dylib +++ b/darwin-x86_64/plugins/platforms/libqcocoa.dylib diff --git a/darwin-x86_64/plugins/platforms/libqminimal.dylib b/darwin-x86_64/plugins/platforms/libqminimal.dylib Binary files differindex 8ff1fc34..8f962f53 100755 --- a/darwin-x86_64/plugins/platforms/libqminimal.dylib +++ b/darwin-x86_64/plugins/platforms/libqminimal.dylib diff --git a/darwin-x86_64/plugins/platforms/libqoffscreen.dylib b/darwin-x86_64/plugins/platforms/libqoffscreen.dylib Binary files differindex f26101c7..bb36cc72 100755 --- a/darwin-x86_64/plugins/platforms/libqoffscreen.dylib +++ b/darwin-x86_64/plugins/platforms/libqoffscreen.dylib diff --git a/darwin-x86_64/plugins/platformthemes/libqflatpak.dylib b/darwin-x86_64/plugins/platformthemes/libqflatpak.dylib Binary files differindex adcbc3e7..17c754a2 100755 --- a/darwin-x86_64/plugins/platformthemes/libqflatpak.dylib +++ b/darwin-x86_64/plugins/platformthemes/libqflatpak.dylib diff --git a/darwin-x86_64/plugins/printsupport/libcocoaprintersupport.dylib b/darwin-x86_64/plugins/printsupport/libcocoaprintersupport.dylib Binary files differindex 3d7975db..064c58fe 100755 --- a/darwin-x86_64/plugins/printsupport/libcocoaprintersupport.dylib +++ b/darwin-x86_64/plugins/printsupport/libcocoaprintersupport.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_debugger.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_debugger.dylib Binary files differindex b11151b9..a8e6f811 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_debugger.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_debugger.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_inspector.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_inspector.dylib Binary files differindex 2933292a..ab7fc63a 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_inspector.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_inspector.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_local.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_local.dylib Binary files differindex cbf377ce..28eecfc1 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_local.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_local.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_messages.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_messages.dylib Binary files differindex 01559d6e..b9302350 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_messages.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_messages.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_native.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_native.dylib Binary files differindex 3a9a51e2..41d064d1 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_native.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_native.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_nativedebugger.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_nativedebugger.dylib Binary files differindex dfada4b3..73aef1e4 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_nativedebugger.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_nativedebugger.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_profiler.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_profiler.dylib Binary files differindex da29e1dc..5fe478fd 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_profiler.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_profiler.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_quickprofiler.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_quickprofiler.dylib Binary files differindex 3df833cc..490bd6ff 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_quickprofiler.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_quickprofiler.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_server.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_server.dylib Binary files differindex 81edca1b..154428fd 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_server.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_server.dylib diff --git a/darwin-x86_64/plugins/qmltooling/libqmldbg_tcp.dylib b/darwin-x86_64/plugins/qmltooling/libqmldbg_tcp.dylib Binary files differindex 5f71aac5..48483423 100755 --- a/darwin-x86_64/plugins/qmltooling/libqmldbg_tcp.dylib +++ b/darwin-x86_64/plugins/qmltooling/libqmldbg_tcp.dylib diff --git a/darwin-x86_64/plugins/sqldrivers/libqsqlite.dylib b/darwin-x86_64/plugins/sqldrivers/libqsqlite.dylib Binary files differindex a0040ee6..007927ad 100755 --- a/darwin-x86_64/plugins/sqldrivers/libqsqlite.dylib +++ b/darwin-x86_64/plugins/sqldrivers/libqsqlite.dylib diff --git a/darwin-x86_64/plugins/styles/libqmacstyle.dylib b/darwin-x86_64/plugins/styles/libqmacstyle.dylib Binary files differindex 0ecebdb5..9782f516 100755 --- a/darwin-x86_64/plugins/styles/libqmacstyle.dylib +++ b/darwin-x86_64/plugins/styles/libqmacstyle.dylib |