Browse Source

Only pass -lQt5PlatformSupport if >=Qt5.6

0.13
Jonas Schnelli 9 years ago
parent
commit
2759597bc8
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
  1. 2
      build-aux/m4/bitcoin_qt.m4
  2. 3
      src/qt/bitcoin.cpp

2
build-aux/m4/bitcoin_qt.m4

@ -343,8 +343,10 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"]) PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
fi fi
else else
if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then
QT_LIBS="-lQt5PlatformSupport $QT_LIBS" QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
fi fi
fi
]) ])
else else
if test x$qt_plugin_path != x; then if test x$qt_plugin_path != x; then

3
src/qt/bitcoin.cpp

@ -533,6 +533,9 @@ int main(int argc, char *argv[])
// Generate high-dpi pixmaps // Generate high-dpi pixmaps
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif #endif
#if QT_VERSION >= 0x050600
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
#endif #endif

Loading…
Cancel
Save