Scons: handle the case when qt4 is in system directories

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index c4f43b76dbdc9180c0dbcaecbe8fb82ddeab114e..6313b7842bf03d60085fa24ac4052931dea5e062 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -144,7 +144,7 @@ docstring const MenuItem::binding() const
        kb_keymap::Bindings bindings = theTopLevelKeymap().findbindings(func_);
 
        if (bindings.size()) {
-               return from_utf8(bindings.begin()->print());
+               return bindings.begin()->print();
        } else {
                lyxerr[Debug::KBMAP]
                        << "No binding for "
@@ -448,10 +448,11 @@ void expandLastfiles(Menu & tomenu)
        int ii = 1;
 
        for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) {
+               string const file = lfit->absFilename();
                docstring const label = convert<docstring>(ii) + ". "
-                       + makeDisplayPath((*lfit), 30)
+                       + makeDisplayPath(file, 30)
                        + char_type('|') + convert<docstring>(ii);
-               tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))));
+               tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, file)));
        }
 }
 
@@ -486,7 +487,7 @@ void expandBookmarks(Menu & tomenu)
        for (size_t i = 1; i <= bm.size(); ++i) {
                if (bm.isValid(i)) {
                        docstring const label = convert<docstring>(i) + ". "
-                               + makeDisplayPath(bm.bookmark(i).filename, 20)
+                               + makeDisplayPath(bm.bookmark(i).filename.absFilename(), 20)
                                + char_type('|') + convert<docstring>(i);
                        tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BOOKMARK_GOTO, 
                                convert<docstring>(i))));