fix merge build src/frontends/qt4/QDocument.cpp

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18509 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QDocument.cpp b/src/frontends/qt4/QDocument.cpp
index 389d395b568e54c4a46260acaff373e4e3c06d9f..1abbe1b9a8992860157dc8057dc28d828b1a036c 100644 (file)
--- a/src/frontends/qt4/QDocument.cpp
+++ b/src/frontends/qt4/QDocument.cpp
@@ -891,7 +891,7 @@ void QDocumentDialog::apply(BufferParams & params)
        params.quotes_language = lga;
 
        int const pos = langModule->languageCO->currentIndex();
-       params.language = languages.getLanguage(lang_[pos]);
+       params.language = lyx::languages.getLanguage(lang_[pos]);
 
        // numbering
        if (params.getTextClass().hasTocLevels()) {

diff --git a/src/frontends/qt4/QListings.cpp b/src/frontends/qt4/QListings.cpp
index 25606e02c71cdaaba37366d61ae5653a4073f1e3..84e6d0efe3d391a94763d516084106553ab2f95d 100644 (file)
--- a/src/frontends/qt4/QListings.cpp
+++ b/src/frontends/qt4/QListings.cpp
@@ -208,7 +208,7 @@ QListingsDialog::QListingsDialog(QListings * form)
        numberStepLE->setValidator(new QIntValidator(0, 1000000, this));
        firstlineLE->setValidator(new QIntValidator(0, 1000000, this));
        lastlineLE->setValidator(new QIntValidator(0, 1000000, this));
-       placementLE->setValidator(new QRegExpValidator(QRegExp("[\*tbph]*"), this));
+       placementLE->setValidator(new QRegExpValidator(QRegExp("[\\*tbph]*"), this));
 }