Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt 5.6 #5362

Merged
merged 2 commits into from
Dec 7, 2016
Merged

Qt 5.6 #5362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67123c8
Rebase Qt patches on 5.6 #3449
jturcotte Dec 6, 2016
6dd7ea0
Don't try to deploy the mng image format plugin on macOS
jturcotte Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion admin/osx/macdeployqt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def QueryQMake(attrib):
'imageformats/libqico.dylib',
'imageformats/libqjpeg.dylib',
'imageformats/libqsvg.dylib',
'imageformats/libqmng.dylib',
]

QT_PLUGINS_SEARCH_PATH=[
Expand Down
42 changes: 0 additions & 42 deletions admin/qt/patches/0001-Fix-crash-on-Mac-OS-if-PAC-URL-contains-non-URL-lega.patch
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions admin/qt/patches/0002-Fix-possible-crash-when-passing-an-invalid-PAC-URL.patch
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions admin/qt/patches/0003-Fix-crash-if-PAC-script-retrieval-returns-a-null-CFD.patch
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions admin/qt/patches/0004-Cocoa-Fix-systray-SVG-icons.patch
View file
Open in desktop

This file was deleted.

115 changes: 0 additions & 115 deletions admin/qt/patches/0005-OSX-Fix-disapearing-tray-icon.patch
View file
Open in desktop

This file was deleted.

Loading