Skip to content

Commit 6fc5c77

Browse files
committed
build, qt: use static QAndroidPlatformIntegrationPlugin
1 parent eb63b8f commit 6fc5c77

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/Makefile.qttest.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if ENABLE_ZMQ
5252
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
5353
endif
5454
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
55-
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
55+
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
5656
$(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(LIBSECP256K1) \
5757
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS)
5858
qt_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)

src/qt/bitcoin.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin);
6565
#elif defined(QT_QPA_PLATFORM_COCOA)
6666
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin);
6767
Q_IMPORT_PLUGIN(QMacStylePlugin);
68+
#elif defined(QT_QPA_PLATFORM_ANDROID)
69+
Q_IMPORT_PLUGIN(QAndroidPlatformIntegrationPlugin)
6870
#endif
6971
#endif
7072

src/qt/test/test_main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
3434
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
3535
#elif defined(QT_QPA_PLATFORM_COCOA)
3636
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin);
37+
#elif defined(QT_QPA_PLATFORM_ANDROID)
38+
Q_IMPORT_PLUGIN(QAndroidPlatformIntegrationPlugin)
3739
#endif
3840
#endif
3941

0 commit comments

Comments
 (0)