mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-12 04:42:36 -03:00
Only pass -lQt5PlatformSupport if >=Qt5.6
This commit is contained in:
parent
59d063d076
commit
2759597bc8
2 changed files with 6 additions and 1 deletions
|
@ -343,7 +343,9 @@ 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
|
||||||
QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
|
if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then
|
||||||
|
QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
else
|
else
|
||||||
|
|
|
@ -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…
Reference in a new issue