Skip to content

Remove qt5.7.1 depends support #1665

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

Merged
merged 5 commits into from
Apr 26, 2020
Merged

Remove qt5.7.1 depends support #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99efa3f
Remove mention of 5.9 option for QT
iFoggz Apr 21, 2020
b3d8945
Remove 5.7.1 support and default for qt59 for now
iFoggz Apr 21, 2020
5c5b8cc
remove qt5.7.1 mk file
iFoggz Apr 21, 2020
11b9fce
Remove qt 5.7.1 patches
iFoggz Apr 21, 2020
49d8e53
Clean up QT_59 line from Makefile
iFoggz Apr 21, 2020
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 depends/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ SOURCES_PATH ?= $(BASEDIR)/sources
BASE_CACHE ?= $(BASEDIR)/built
SDK_PATH ?= $(BASEDIR)/SDKs
NO_QT ?=
QT_59 ?= 0
NO_WALLET ?=
NO_UPNP ?=
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
Expand Down
6 changes: 0 additions & 6 deletions depends/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ For example:

make HOST=x86_64-w64-mingw32 -j4

You can also pass in an option to build Qt5.9.4 (required for QtCharts and
charting the vote counts):

make HOST=host-platform-triple QT_59=1


A prefix will be generated that's suitable for plugging into Gridcoin's
configure. In the above example, a dir named x86_64-w64-mingw32 will be
created. To use it for Gridcoin:
Expand Down
6 changes: 0 additions & 6 deletions depends/packages/packages.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@ native_packages := native_ccache

qt_packages = qrencode

ifeq ($(QT_59),1)
qt_linux_packages:=qt59 expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
qt_darwin_packages=qt59
qt_mingw32_packages=qt59
else
qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
qt_darwin_packages=qt
qt_mingw32_packages=qt
endif

ifeq ($(BDB_53),1)
wallet_packages=bdb53
Expand Down
212 changes: 0 additions & 212 deletions depends/packages/qt.mk
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions depends/patches/qt/fix-xcb-include-order.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions depends/patches/qt/fix_qt_pkgconfig.patch
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions depends/patches/qt/mac-qmake.conf
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions depends/patches/qt/mingw-uuidof.patch
View file
Open in desktop

This file was deleted.

Loading