GuiCitation: set instant search as the default

[lyx.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 81d5373a70c4e7490d21eb7f727670c85c612e93..0eb55bad0266b8c6e43d336b1d9a51c3a1bcddf1 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1017,6 +1017,9 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        QCoreApplication::setOrganizationName(app_name);
        QCoreApplication::setOrganizationDomain("lyx.org");
        QCoreApplication::setApplicationName(lyx_package);
+#if QT_VERSION >= 0x050000
+       QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
 
        qsrand(QDateTime::currentDateTime().toTime_t());
 
@@ -1101,7 +1104,7 @@ GuiApplication * theGuiApp()
 double GuiApplication::pixelRatio() const
 {
 #if QT_VERSION >= 0x050000
-       return devicePixelRatio();
+       return qt_scale_factor * devicePixelRatio();
 #else
        return 1.0;
 #endif
@@ -2978,7 +2981,7 @@ GuiApplication::ReturnValues GuiApplication::readUIFile(FileName ui_path)
                        QString const file = toqstr(lex.getString());
                        bool const success = readUIFile(file, true);
                        if (!success) {
-                               LYXERR0("Failed to read inlcuded file: " << fromqstr(file));
+                               LYXERR0("Failed to read included file: " << fromqstr(file));
                                return ReadError;
                        }
                        break;