Compile fix for qt versions below 4.6.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index e65ef903209b06b3d589cd49528327e182a72ea7..8652b4b032efaef46ba7cb2f8720b60f21db82f9 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -290,22 +290,19 @@ int LyX::exec(int & argc, char * argv[])
 {
        // Minimal setting of locale before parsing command line
        try {
-               init_package(os::utf8_argv(0), string(), string(),
-                       top_build_dir_is_one_level_up);
+               init_package(os::utf8_argv(0), string(), string());
+               // we do not get to this point when init_package throws an exception
+               locale_init();
        } catch (ExceptionMessage const & message) {
                LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_);
        }
-       // FIXME: This breaks out of source build under Windows.
-       locale_init();
 
        // Here we need to parse the command line. At least
        // we need to parse for "-dbg" and "-help"
        easyParse(argc, argv);
 
        try {
-               init_package(os::utf8_argv(0),
-                       cl_system_support, cl_user_support,
-                       top_build_dir_is_one_level_up);
+               init_package(os::utf8_argv(0), cl_system_support, cl_user_support);
        } catch (ExceptionMessage const & message) {
                if (message.type_ == ErrorException) {
                        Alert::error(message.title_, message.details_);
@@ -671,7 +668,7 @@ static void error_handler(int err_sig)
                          "hope you have not lost any data.\n"
                          "Please read the bug-reporting instructions "
                          "in 'Help->Introduction' and send us a bug report, "
-                         "if necessary. Thanks !\nBye.");
+                         "if necessary. Thanks!\nBye.");
                break;
        case SIGINT:
        case SIGTERM: