Browse Source

Merge pull request #3253

initramfs (1):
      refactor(hidpi): enable HiDPI support if Qt supports it
pull/3307/head
sudden6 9 years ago
parent
commit
3830a1940c
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 5
      qtox.pro
  2. 10
      src/main.cpp

5
qtox.pro

@ -108,11 +108,6 @@ contains(DISABLE_FILTER_AUDIO, NO) { @@ -108,11 +108,6 @@ contains(DISABLE_FILTER_AUDIO, NO) {
DEFINES += QTOX_FILTER_AUDIO
}
contains(HIGH_DPI, YES) {
QT_DEVICE_PIXEL_RATIO= auto
DEFINES += HIGH_DPI
}
contains(JENKINS,YES) {
INCLUDEPATH += ./libs/include/
} else {

10
src/main.cpp

@ -117,6 +117,12 @@ void logMessageHandler(QtMsgType type, const QMessageLogContext& ctxt, const QSt @@ -117,6 +117,12 @@ void logMessageHandler(QtMsgType type, const QMessageLogContext& ctxt, const QSt
int main(int argc, char *argv[])
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
qInstallMessageHandler(logMessageHandler);
QApplication a(argc, argv);
@ -129,10 +135,6 @@ int main(int argc, char *argv[]) @@ -129,10 +135,6 @@ int main(int argc, char *argv[])
osx::migrateProfiles();
#endif
#ifdef HIGH_DPI
a.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
#endif
qsrand(time(0));
Settings::getInstance();
Translator::translate();

Loading…
Cancel
Save