Skip to content

Commit 2759597

Browse files
committed
Only pass -lQt5PlatformSupport if >=Qt5.6
1 parent 59d063d commit 2759597

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,9 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
343343
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
344344
fi
345345
else
346-
QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
346+
if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then
347+
QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
348+
fi
347349
fi
348350
])
349351
else

src/qt/bitcoin.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,9 @@ int main(int argc, char *argv[])
533533
// Generate high-dpi pixmaps
534534
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
535535
#endif
536+
#if QT_VERSION >= 0x050600
537+
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
538+
#endif
536539
#ifdef Q_OS_MAC
537540
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
538541
#endif

0 commit comments

Comments
 (0)