aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2016-06-20 10:17:01 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2016-06-20 10:17:01 +0200
commit2759597bc8617039a7ffa6210f4d49a985a20093 (patch)
treef0e7868f6f1cd8fe52ede29d06d4b44079d72a12
parent59d063d07660d6e8d53ed8aa1eb8b0747ea6767c (diff)
Only pass -lQt5PlatformSupport if >=Qt5.6
-rw-r--r--build-aux/m4/bitcoin_qt.m44
-rw-r--r--src/qt/bitcoin.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index 210df3c025..74d9102674 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -343,7 +343,9 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
fi
else
- QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
+ if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then
+ QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
+ fi
fi
])
else
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 6218ab6ab0..64b5c83d72 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -533,6 +533,9 @@ int main(int argc, char *argv[])
// Generate high-dpi pixmaps
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
+#if QT_VERSION >= 0x050600
+ QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
#ifdef Q_OS_MAC
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
#endif