Skip to content

Commit 6bf4854

Browse files
committed
partial bitcoin#23757: fix GUI not loading on Qt 5.15
excludes: - 27f353d
1 parent 75a1016 commit 6bf4854

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/Makefile.qttest.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if ENABLE_ZMQ
5858
qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
5959
endif
6060
qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBDASHBLS) $(LIBUNIVALUE) $(LIBLEVELDB) \
61-
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BACKTRACE_LIB) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
61+
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BACKTRACE_LIB) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
6262
$(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
6363
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
6464
qt_test_test_dash_qt_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)

src/qt/bitcoin.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin);
6868
#elif defined(QT_QPA_PLATFORM_COCOA)
6969
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin);
7070
Q_IMPORT_PLUGIN(QMacStylePlugin);
71+
#elif defined(QT_QPA_PLATFORM_ANDROID)
72+
Q_IMPORT_PLUGIN(QAndroidPlatformIntegrationPlugin)
7173
#endif
7274
#endif
7375

src/qt/test/test_main.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
3939
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
4040
#elif defined(QT_QPA_PLATFORM_COCOA)
4141
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin);
42+
#elif defined(QT_QPA_PLATFORM_ANDROID)
43+
Q_IMPORT_PLUGIN(QAndroidPlatformIntegrationPlugin)
4244
#endif
4345
#endif
4446

0 commit comments

Comments
 (0)