Limit the nopassthurchars case in beamer to URL

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 20201f41d78883161c68b98e440a11f9469bea78..c0dbd019b97ba51590ec0e4fb00156ce70bef29f 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -50,7 +50,6 @@
 #include "frontends/Application.h"
 
 #include "support/ConsoleApplication.h"
-#include "support/convert.h"
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/environment.h"
@@ -121,14 +120,6 @@ RunMode run_mode = PREFERRED;
 OverwriteFiles force_overwrite = UNSPECIFIED;
 
 
-// Scale the GUI by this factor. This works whether we have a HiDpi screen
-// or not and scales everything, also fonts. Can only be changed by setting
-// the QT_SCALE_FACTOR environment variable before launching LyX and only
-// works properly with Qt 5.6 or higher.
-
-double qt_scale_factor = 1.0;
-
-
 namespace {
 
 // Filled with the command line arguments "foo" of "-sysdir foo" or
@@ -318,17 +309,6 @@ int LyX::exec(int & argc, char * argv[])
        // we need to parse for "-dbg" and "-help"
        easyParse(argc, argv);
 
-#if QT_VERSION >= 0x050600
-       // Check whether Qt will scale all GUI elements and accordingly
-       // set the scale factor so that to avoid blurred images and text
-       char const * const scale_factor = getenv("QT_SCALE_FACTOR");
-       if (scale_factor) {
-               qt_scale_factor = convert<double>(scale_factor);
-               if (qt_scale_factor < 1.0)
-                       qt_scale_factor = 1.0;
-       }
-#endif
-
        try {
                init_package(os::utf8_argv(0), cl_system_support, cl_user_support);
        } catch (ExceptionMessage const & message) {
@@ -1371,7 +1351,7 @@ int parse_geometry(string const & arg1, string const &, string &)
        return -1;
 #else
        // but that is only done if QPA_XCB is not defined.
-       return 0;
+       return 1;
 #endif
 }