diff options
author | fanquake <fanquake@gmail.com> | 2021-06-02 12:15:15 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-06-09 12:33:38 +0800 |
commit | ecffe8689dfbdc33deba8119376dcc8f208f0f72 (patch) | |
tree | b989a27ea30fb5a1671f7580b75da0f0229b8eb8 | |
parent | 639f0642539c6b5ba9bc7b39bb8bb52752029bee (diff) | |
download | bitcoin-ecffe8689dfbdc33deba8119376dcc8f208f0f72.tar.xz |
macdeploy: remove qt4 related code
-rwxr-xr-x | contrib/macdeploy/macdeployqtplus | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 118f2315cb..5377a4ce1d 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -84,8 +84,8 @@ class FrameworkInfo(object): if line == "": return None - # Don't deploy system libraries (exception for libQtuitools and libQtlucene). - if line.startswith("/System/Library/") or line.startswith("@executable_path") or (line.startswith("/usr/lib/") and "libQt" not in line): + # Don't deploy system libraries + if line.startswith("/System/Library/") or line.startswith("@executable_path") or line.startswith("/usr/lib/"): return None m = cls.reOLine.match(line) @@ -286,14 +286,6 @@ def copyFramework(framework: FrameworkInfo, path: str, verbose: int) -> Optional if verbose: print("Copied Contents:", fromContentsDir) print(" to:", toContentsDir) - elif framework.frameworkName.startswith("libQtGui"): # Copy qt_menu.nib (applies to non-framework layout) - qtMenuNibSourcePath = os.path.join(framework.frameworkDirectory, "Resources", "qt_menu.nib") - qtMenuNibDestinationPath = os.path.join(path, "Contents", "Resources", "qt_menu.nib") - if os.path.exists(qtMenuNibSourcePath) and not os.path.exists(qtMenuNibDestinationPath): - shutil.copytree(qtMenuNibSourcePath, qtMenuNibDestinationPath, symlinks=True) - if verbose: - print("Copied for libQtGui:", qtMenuNibSourcePath) - print(" to:", qtMenuNibDestinationPath) return toPath |