Skip to content

Commit 1be8e0f

Browse files
hebastofanquake
authored andcommitted
build: Add QMacStyle support
1 parent e674e94 commit 1be8e0f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
123123
_BITCOIN_QT_CHECK_STATIC_LIBS
124124
125125
if test "x$qt_plugin_path" != x; then
126-
QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms"
126+
QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms -L$qt_plugin_path/styles"
127127
if test -d "$qt_plugin_path/accessible"; then
128128
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
129129
fi
@@ -154,6 +154,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
154154
AX_CHECK_LINK_FLAG([[-framework Metal]],[QT_LIBS="$QT_LIBS -framework Metal"],[AC_MSG_ERROR(could not link against Metal framework)])
155155
AX_CHECK_LINK_FLAG([[-framework QuartzCore]],[QT_LIBS="$QT_LIBS -framework QuartzCore"],[AC_MSG_ERROR(could not link against QuartzCore framework)])
156156
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QCocoaIntegrationPlugin], [-lqcocoa])
157+
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle])
157158
AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa])
158159
elif test "x$TARGET_OS" = xandroid; then
159160
QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lqtforandroid -ljnigraphics -landroid -lqtfreetype -lQt5EglSupport $QT_LIBS"

src/qt/bitcoin.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
6262
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
6363
#elif defined(QT_QPA_PLATFORM_COCOA)
6464
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin);
65+
Q_IMPORT_PLUGIN(QMacStylePlugin);
6566
#endif
6667
#endif
6768

0 commit comments

Comments
 (0)