Skip to content

Commit ecffe86

Browse files
committed
macdeploy: remove qt4 related code
1 parent 639f064 commit ecffe86

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

contrib/macdeploy/macdeployqtplus

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ class FrameworkInfo(object):
8484
if line == "":
8585
return None
8686

87-
# Don't deploy system libraries (exception for libQtuitools and libQtlucene).
88-
if line.startswith("/System/Library/") or line.startswith("@executable_path") or (line.startswith("/usr/lib/") and "libQt" not in line):
87+
# Don't deploy system libraries
88+
if line.startswith("/System/Library/") or line.startswith("@executable_path") or line.startswith("/usr/lib/"):
8989
return None
9090

9191
m = cls.reOLine.match(line)
@@ -286,14 +286,6 @@ def copyFramework(framework: FrameworkInfo, path: str, verbose: int) -> Optional
286286
if verbose:
287287
print("Copied Contents:", fromContentsDir)
288288
print(" to:", toContentsDir)
289-
elif framework.frameworkName.startswith("libQtGui"): # Copy qt_menu.nib (applies to non-framework layout)
290-
qtMenuNibSourcePath = os.path.join(framework.frameworkDirectory, "Resources", "qt_menu.nib")
291-
qtMenuNibDestinationPath = os.path.join(path, "Contents", "Resources", "qt_menu.nib")
292-
if os.path.exists(qtMenuNibSourcePath) and not os.path.exists(qtMenuNibDestinationPath):
293-
shutil.copytree(qtMenuNibSourcePath, qtMenuNibDestinationPath, symlinks=True)
294-
if verbose:
295-
print("Copied for libQtGui:", qtMenuNibSourcePath)
296-
print(" to:", qtMenuNibDestinationPath)
297289

298290
return toPath
299291

0 commit comments

Comments
 (0)