[bitcoin/bitcoin] gui: Drop qt4 support (#13458)

MarcoFalke commented on this pull request.

> @@ -35,8 +35,8 @@ env:
— HOST=i686-pc-linux-gnu PACKAGES=»g++-multilib python3-zmq» DEP_OPTS=»NO_QT=1″ RUN_TESTS=true GOAL=»install» BITCOIN_CONFIG=»—enable-zmq —enable-glibc-back-compat —enable-reduce-exports LDFLAGS=-static-libstdc++» CONFIG_SHELL=»/bin/dash»
# x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout)
— HOST=x86_64-unknown-linux-gnu PACKAGES=»python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev» DEP_OPTS=»NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1″ RUN_TESTS=true GOAL=»install» BITCOIN_CONFIG=»—enable-zmq —with-gui=qt5 —enable-glibc-back-compat —enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER»
-# Qt4 & system libs
— — HOST=x86_64-unknown-linux-gnu PACKAGES=»python3-zmq qt4-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev xvfb libqt4-dev» NO_DEPENDS=1 NEED_XVFB=1 RUN_TESTS=true GOAL=»install» BITCOIN_CONFIG=»—enable-zmq —with-incompatible-bdb —enable-glibc-back-compat —enable-reduce-exports —with-gui=qt4 CPPFLAGS=-DDEBUG_LOCKORDER» DISPLAY=:99.0
+# x86_64 Linux (Qt5 & system libs)
+ — HOST=x86_64-unknown-linux-gnu PACKAGES=»python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev» NO_DEPENDS=1 RUN_TESTS=true GOAL=»install» BITCOIN_CONFIG=»—enable-zmq —with-incompatible-bdb —enable-glibc-back-compat —enable-reduce-exports —with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER» DISPLAY=:99.0

Can probably also remove two instances of `DISPLAY`?

Добавить комментарий