Am Freitag, 29. März 2019, 12:49:15 CET schrieb Guenter Milde:
> > [<LANG>/]/<LAYOUT CATEGORY>/[<LAYOUT GUI NAME>*/]<file>
> 
> Now, the menu entry Help>Specific_Manuals ...
> fails to open any of the specific manuals. The terminal says
> 
>   LyX: unable to find documentation file `Linguistics'. Bad installation?


Changing lib/ui/stdmenus.inc helps

        Kornel
diff --git a/autotests/export/latex/linebreak-bug.lyx b/autotests/export/latex/linebreak-bug.lyx
index 8b937e2..5217023 100644
--- a/autotests/export/latex/linebreak-bug.lyx
+++ b/autotests/export/latex/linebreak-bug.lyx
@@ -1,7 +1,7 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 554
+\lyxformat 555
 \begin_document
 \begin_header
 \save_transient_properties true
 \origin unavailable
 \textclass article
@@ -84,11 +84,11 @@
 \begin_layout Standard
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="3">
 <features tabularvalignment="middle">
 <column alignment="center" valignment="top">
-<column alignment="center" valignment="top" width="10col%">
+<column alignment="left" valignment="top" width="0pt">
 <column alignment="center" valignment="top">
 <row>
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
@@ -96,15 +96,15 @@
 a
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rotate="90" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" rotate="90" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-test
+test, etwas mehr
 \begin_inset Newline newline
 \end_inset
 
 test
 \end_layout
@@ -129,15 +129,19 @@ e
 b
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-c
+c sollte mit mehr
+\begin_inset Newline newline
+\end_inset
+
+ als einer Zeile sein
 \end_layout
 
 \end_inset
 </cell>
 <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
diff --git a/development/autotests/findadv-22-in.txt b/development/autotests/findadv-22-in.txt
index 8a7ad61..ca35125 100644
--- a/development/autotests/findadv-22-in.txt
+++ b/development/autotests/findadv-22-in.txt
@@ -12,18 +12,18 @@ KK: I_t\\wedge s
 KK: \C\[Home]
 KK: \CF
 KK: \Cm
 KK: t\\wedge s\[Return]
 KK: 
-CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n.*idx: 1 par: 0 pos: 0\n.*with len: 3
+CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n.*idx: 1 par: 0 pos: 0\n with len: 3
 
 CN: Part 2
 KK: \[Escape]\C\[Home]
 KK: \CF
 KK: \At\Ai\Ah
 KK: \[Return]
 CP: Identified Features
-CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n.*idx: 1 par: 0 pos: 0\n.*with len: 3
+CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n.*idx: 1 par: 0 pos: 0\n with len: 3
 TestEnd
 Lang C
 Assert searchPatterns.pl base=findadv-22
 
diff --git a/development/autotests/findadv-combined-in.txt b/development/autotests/findadv-combined-in.txt
index c273a13..76fd57e 100644
--- a/development/autotests/findadv-combined-in.txt
+++ b/development/autotests/findadv-combined-in.txt
@@ -25,11 +25,11 @@ KK: \Cs
 # be found at possibly different inset
 #
 
 #
 KK: \[Escape]\C\[Home]
-CP: Key (queried) [action=buffer-begin][Ctrl+Home]
+#CP: Key (queried) [action=buffer-begin][Ctrl+Home]
 CN: Part 001
 KK: \C\[F21]\C\[F20]\\@\[Return]
 Sleep 1
 CN: Escaped : '\@'
 CR: [pP]utting selection at .*idx: 0 par: 0 pos: 10\n with len: 1
diff --git a/development/autotests/findadv-re-01-in.txt b/development/autotests/findadv-re-01-in.txt
index 468b17d..291dc04 100644
--- a/development/autotests/findadv-re-01-in.txt
+++ b/development/autotests/findadv-re-01-in.txt
@@ -1,10 +1,11 @@
 # Finding special latex/regexp chars: (
 #
 Lang it_IT.utf8
 CO: findadv-re-01.ctrl
 TestBegin test.lyx -dbg key,find > findadv-re-01.loga.txt 2>&1
+KD: 50
 CN: Part 1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
 KK: \Axregexp-mode\[Return]\\(\[Return]
diff --git a/development/autotests/findadv-re-02-in.txt b/development/autotests/findadv-re-02-in.txt
index d9b7e1a..991994d 100644
--- a/development/autotests/findadv-re-02-in.txt
+++ b/development/autotests/findadv-re-02-in.txt
@@ -1,10 +1,11 @@
 # Finding special latex/regexp chars: \
 #
 Lang it_IT.utf8
 CO: findadv-re-02.ctrl
 TestBegin test.lyx -dbg key,find > findadv-re-02.loga.txt 2>&1
+KD: 50
 CN: Part 1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
 KK: \Axregexp-mode\[Return]\\\\\[Return]
diff --git a/development/autotests/findadv-re-03-in.txt b/development/autotests/findadv-re-03-in.txt
index 9718467..1a7c9e3 100644
--- a/development/autotests/findadv-re-03-in.txt
+++ b/development/autotests/findadv-re-03-in.txt
@@ -1,10 +1,11 @@
 # Finding special latex/regexp chars: {
 #
 Lang it_IT.utf8
 CO: findadv-re-03.ctrl
 TestBegin test.lyx -dbg key,find > findadv-re-03.loga.txt 2>&1
+KD: 50
 CN: Part 1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
 KK: \Axregexp-mode\[Return]\\{\[Return]
diff --git a/development/autotests/findadv-re-04-in.txt b/development/autotests/findadv-re-04-in.txt
index ef09d9f..e10bf42 100644
--- a/development/autotests/findadv-re-04-in.txt
+++ b/development/autotests/findadv-re-04-in.txt
@@ -3,10 +3,11 @@
 Lang sk_SK.utf8
 CO: findadv-re-04.ctrl
 CN: Part 1
 CP: Init key
 TestBegin test.lyx -dbg key,find > findadv-re-04.loga.txt 2>&1
+KD: 30
 CP: Key (queried) [action=buffer-begin][Ctrl+Home]
 KK: The quick Brown \CeFox jUMps\Ce over the lazy Dog\[Return]
 Sleep 1
 KK: \C\[Home]
 KK: \Cs
@@ -28,11 +29,11 @@ TestBegin test.lyx -dbg key,find >> findadv-re-04.loga.txt 2>&1
 CN: Case insensitive, format not ignored [a-z]*
 KK: \CF
 # Uncheck ignore format (depends on IT language)
 KK: \At\Ai\Ah
 KK: \Ce
-KK: \Axregexp-mode\[Return]\\b[a-z\\s]*\\b\[Return]\[Return]\[Return]
+KK: \Axregexp-mode\[Return]\\b[a-z]*\\b\[Return]\[Return]\[Return]
 Cr: ^.*Putting 
 CP: Putting selection at .*idx: 0 par: 0 pos: 16\n with len: 3
 Cr: ^.*Putting 
 CP: Putting selection at .*idx: 0 par: 0 pos: 20\n with len: 5
 Cr: ^.*Putting 
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 08a6107..d5bd8f9 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -104,11 +104,10 @@ lyx_install("data" ${TOP_SRC_DIR}/lib commands     *.def    .)
 #lyx_install("data" ${TOP_SRC_DIR}/lib doc          *.txt    . ${_all_languages})
 lyx_install("data" ${TOP_SRC_DIR}/lib doc          *      biblio clipart)
 
 lyx_install("data" ${TOP_SRC_DIR}/lib doc/${_all_languages} *    clipart)
 
-set(example_subdirs ${_all_languages} pt_BR pt_PT Articles Curricula_Vitae External_Material "Graphics_\&_Insets" Handouts Letters Modules Posters Presentations Scripts Theses Books Theses)
 lyx_install("data" ${TOP_SRC_DIR}/lib examples     *    . *)
 lyx_install("data" ${TOP_SRC_DIR}/lib examples/*   *    . *)
 lyx_install("font" ${TOP_SRC_DIR}/lib/fonts .      *      .)
 foreach(_imgext "png" "svgz" "gif" "xpm")
   lyx_install("data" ${TOP_SRC_DIR}/lib images       "*.${_imgext}"      . ipa commands attic classic oxygen)
diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 2367c01..6625468 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -138,10 +138,12 @@ elseif(WIN32)
         endif()
     endif()
 else()
 	# needed by rpm
 	set(CPACK_SET_DESTDIR "ON")
+	set(CPACK_RPM_PACKAGE_RELOCATABLE OFF)
+	set(CPACK_PACKAGE_RELOCATABLE OFF)
 endif()
 
 FILE(READ "${TOP_CMAKE_PATH}/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE)
 set(CPACK_RPM_PACKAGE_GROUP "Applications/Publishing")
 set(CPACK_RPM_PACKAGE_VENDOR "The LyX team")
diff --git a/development/cmake/modules/LyXDestinations.cmake b/development/cmake/modules/LyXDestinations.cmake
index 512fca0..1ba7b51 100644
--- a/development/cmake/modules/LyXDestinations.cmake
+++ b/development/cmake/modules/LyXDestinations.cmake
@@ -73,19 +73,36 @@ function(get_font_destination _result)
     message(FATAL_ERROR "Unhandled platform")
   endif()
   set(${_result} ${_dir} PARENT_SCOPE)
 endfunction()
 
+function(get_unix_texmflocal newpath)
+  execute_process(COMMAND "kpsewhich" "-var-value=TEXMFLOCAL"
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE path
+    )
+  if (result EQUAL 0)
+    # Strip trailing \n
+    string(REGEX REPLACE "\n$" "" path2 ${path})
+    # message(STATUS "path = ${path2}")
+    set(${newpath} "${path2}/tex/latex/${_lyx}/" PARENT_SCOPE)
+  else()
+    set(${newpath} "lyx2.4/tex" PARENT_SCOPE)
+  endif()
+endfunction()
+
 function(get_tex_destination _result)
   set(_dir)
   if(WIN32)
     set(_dir "${LYX_DATA_SUBDIR}tex/")
   elseif(APPLE)
     # "Contents/Resources/tex/"
     set(_dir "${LYX_DATA_SUBDIR}tex/")
   elseif(UNIX)
+    #get_unix_texmflocal(_dir)
     set(_dir "${LYX_DATA_SUBDIR}tex/")
+    #set(_dir "texlive/texmf-local/tex/latex/${_lyx}/")
   else()
     message(FATAL_ERROR "Unhandled platform")
   endif()
   set(${_result} ${_dir} PARENT_SCOPE)
 endfunction()
diff --git a/development/cmake/scripts/xmingw b/development/cmake/scripts/xmingw
index ec287da..047c63e 100755
--- a/development/cmake/scripts/xmingw
+++ b/development/cmake/scripts/xmingw
@@ -20,11 +20,11 @@ lyxsrcdir=$1
 builddir=$PWD
 
 # ---------------------------------------------------------
 # set 'versionname' to overwrite generated one based on 'ver'
 #
-ver=2.3
+ver=2.4
 date=`date --utc '+%Y.%m.%d-%H.%M'`
 if [ -z $versionname ]; then
     versionname=LyX$ver-$date
 fi
 
@@ -103,11 +103,11 @@ mergefile=-DLYX_MERGE_FILES=0
 
 cmake $lyxsrcdir \
 	-DCMAKE_VERBOSE_MAKEFILE=1 \
     -DLYX_CPACK=1 \
     -DLYX_PROGRAM_SUFFIX="" \
-    -DLYX_CONSOLE=FORCE \
+    -DLYX_CONSOLE=OFF \
     -DLYX_XMINGW=$compiler \
     -DLYX_USE_QT=QT5 \
     -DLYX_QUIET=1 \
     -DLYX_HUNSPELL=1 \
     -DLYX_3RDPARTY_BUILD=1 \
diff --git a/lib/examples/biblioExample.bib b/lib/examples/biblioExample.bib
index bfed96f..f966626 100644
--- a/lib/examples/biblioExample.bib
+++ b/lib/examples/biblioExample.bib
@@ -31,11 +31,11 @@
   author = {Appelhans, Leah N. and Zuccaccia, Daniele and Kovacevic, Anes and
 	Chianese, Anthony R. and Miecznikowski, John R. and Macchioni, Aleco
 	and Clot, Eric and Eisenstein, Odile and Crabtree, Robert H.},
   title = {{A}n anion-dependent switch in selectivity results from a change
 	of {C}---{H} activation mechanism in the reaction of an imidazolium
-	salt with $\mbox{IrH}_{\mbox{5}}(\mbox{PPh}_{\mbox{3}})_{\mbox{2}}$},
+	salt with $\mbox{IrH}_{\mbox{5}}{(\mbox{PPh}_{\mbox{3}})}_{\mbox{2}}$},
   journal = {{J}.~{A}m.\ {C}hem. {S}oc.},
   year = {2005},
   volume = {127},
   pages = {16299--16311},
   number = {46},
@@ -56,11 +56,11 @@
 
 @ARTICLE{Arduengo1994,
   author = {Arduengo, III, Anthony J. and Siegfried F. Gamper and Joseph C. Calabrese
 	and Fredric Davidson},
   title = {{L}ow-coordinate carbene complexes of nickel(0) and platinum(0)},
-  journal = jacsat,
+  journal = {jacsat},
   year = {1994},
   volume = {116},
   pages = {4391--4394},
   number = {10},
   doi = {10.1021/ja00089a029}
diff --git a/lib/languages b/lib/languages
index 89ecabf..554ed32 100644
--- a/lib/languages
+++ b/lib/languages
@@ -909,10 +909,11 @@ Language khmer
 	LangCode         km_KH
 End
 
 Language korean
 	GuiName         "Korean"
+	HasGuiSupport    true
 	Encoding        euc-kr
 	QuoteStyle      cjkangle
 	DateFormats     "yyyy년 M월 d일|yyyy. M. d.|yy. M. d."
 	LangCode        ko_KR
 	Requires        CJK
diff --git a/lib/scripts/prefTest.pl.in b/lib/scripts/prefTest.pl.in
index 4e0aab7..76e33fa 100755
--- a/lib/scripts/prefTest.pl.in
+++ b/lib/scripts/prefTest.pl.in
@@ -28,10 +28,11 @@ my $userdir = "$bindir/Testing/.lyx";
 
 my %allowedKeys = (
   "use_converter_needauth_forbidden" => ["true", "false"],
   "use_converter_needauth" => ["true", "false"],
   "allow_geometry_session" => ["false"],
+  "load_session" => ["true", "false"],
     );
 
 my %Converter = ();
 
 chdir($bindir);
@@ -51,22 +52,28 @@ if (defined($ARGV[0]) && ($ARGV[0] =~ /^(test|default)$/)) {
 
 if ($handle_argv eq "test") {
   @ctestpars = &getSubstitutes(\%allowedKeys, \%Subst,
 			       "allow_geometry_session=false",
 			       "use_converter_needauth_forbidden=false",
-			       "use_converter_needauth=false", @ARGV);
+			       "use_converter_needauth=false",
+			       "load_session=false",
+			       @ARGV);
 }
 elsif ($handle_argv eq "default") {
   $shell_escapes = 0;
   @ctestpars = &getSubstitutes(\%allowedKeys, \%Subst,
 			       "allow_geometry_session=false",
 			       "use_converter_needauth_forbidden=true",
-			       "use_converter_needauth=true", @ARGV);
+			       "use_converter_needauth=true",
+			       "load_session=true",
+			       @ARGV);
 }
 else {
   @ctestpars = &getSubstitutes(\%allowedKeys, \%Subst,
-			       "allow_geometry_session=false", @ARGV);
+			       "allow_geometry_session=false",
+			       "load_session=true",
+			       @ARGV);
 }
 
 &getConverters($userdir, \%Converter, $shell_escapes);
 
 &applyChanges($userdir, \%Subst, \%Converter, $shell_escapes);
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index afe883a..c350c58 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -647,24 +647,24 @@ Menuset
 		Separator
 		Item "About LyX|X" "dialog-show aboutlyx"
 	End
 
 	Menu "examples"
-		Item "Beamer Presentations|B" "help-open Beamer"
-		Item "Braille|a" "help-open Braille"
-		Item "Colored boxes|r" "help-open Fancy_Colored_Boxes"
-		Item "Feynman-diagram|F" "help-open FeynmanDiagrams"
-		Item "Knitr|K" "help-open Rnw_(knitr)"
-		Item "LilyPond|P" "help-open LilyPond_Book"
-		Item "Linguistics|L" "help-open Linguistics"
-		Item "Multilingual Captions|C" "help-open MultilingualCaptions"
-		Item "Paralist|t" "help-open Paragraph_Lists_(paralist)"
-		Item "PDF comments|D" "help-open PDF_Comments"
-		Item "PDF forms|o" "help-open PDF_Form"
-		Item "Hazard and Precautionary Statements|H" "help-open Hazard_and_Precautionary_Statements"
-		Item "Sweave|S" "help-open Sweave"
-		Item "XY-pic|X" "help-open xypic"
+		Item "Beamer Presentations|B" "help-open Presentations/Beamer"
+		Item "Braille|a" "help-open Modules/Braille"
+		Item "Colored boxes|r" "help-open Modules/Fancy_Colored_Boxes"
+		Item "Feynman-diagram|F" "help-open Graphics_and_Insets/Feynman_Diagrams"
+		Item "Knitr|K" "help-open Modules/Rnw_%28knitr%29"
+		Item "LilyPond|P" "help-open Modules/LilyPond_Book"
+		Item "Linguistics|L" "help-open Modules/Linguistics"
+		Item "Multilingual Captions|C" "help-open Modules/Multilingual_Captions"
+		Item "Paralist|t" "help-open Modules/Paragraph_Lists_%28paralist%29"
+		Item "PDF comments|D" "help-open Modules/PDF_Comments"
+		Item "PDF forms|o" "help-open Modules/PDF_Form"
+		Item "Hazard and Precautionary Statements|H" "help-open Modules/Hazard_and_Precautionary_Statements"
+		Item "Sweave|S" "help-open Modules/Sweave"
+		Item "XY-pic|X" "help-open Graphics_and_Insets/XY-Pic"
 	End
 
 
 End
 
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 54d6019..aa331eb 100755
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -146,10 +146,11 @@ execute_process(
 ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE}
       --from-code=UTF-8
+      --width=80
       --default-domain=${_lyxname} --directory=${TOP_SRC_DIR}
       --add-comments=TRANSLATORS:
       --language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=B_ --keyword=qt_
       --files-from=${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in
       --copyright-holder="LyX Developers" --msgid-bugs-address=lyx-devel@lists.lyx.org
diff --git a/po/LINGUAS b/po/LINGUAS
index dc77dd9..2a7542d 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,3 @@
 # The list of languages known to LyX
 #ar bg ca cs da de el en es eu fi fr gl he hu ia id it ja ko nb nl nn pl pt_BR pt_PT ro ru sk sl sr sv tr uk wa zh_CN zh_TW
-ar cs de el en es eu fi fr he hu ia id it ja nb nn pl pt_BR pt_PT ru sk sv tr uk zh_CN zh_TW
+ar cs de el en es eu fi fr he hu ia id it ja ko nb nn pl pt_BR pt_PT ru sk sv tr uk zh_CN zh_TW
diff --git a/po/Makevars.template b/po/Makevars.template
index 0648ec7..c318c89 100644
--- a/po/Makevars.template
+++ b/po/Makevars.template
@@ -61,11 +61,11 @@ MSGMERGE_OPTIONS =
 
 # These options get passed to msginit.
 # If you want to disable line wrapping when writing PO files, add
 # --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
 # MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
+MSGINIT_OPTIONS = --width=80 --sort-output
 
 # This tells whether or not to regenerate a PO file when $(DOMAIN).pot
 # has changed.  Possible values are "yes" and "no".  Set this to no if
 # the POT file is checked in the repository and the version control
 # program ignores timestamps.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 39c751f..396693c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -92,13 +92,23 @@ if (LYX_VLD)
 	set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt PROPERTIES GENERATED TRUE)
 	set(vld_files ${CMAKE_CURRENT_BINARY_DIR}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt)
 	lyx_add_info_files(VLD ${vld_files})
 endif()
 
-if(WIN32 AND NOT MINGW)
-	set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
-	message(STATUS "Using icon defined in resource file: ${FILE_RC}")
+if(WIN32)
+	if (MINGW)
+		add_custom_command(
+			OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lyxwinres.coff
+			COMMAND ${CMAKE_RC_COMPILER} -O coff
+				-I${TOP_BINARY_DIR}
+				-I${TOP_SRC_DIR}/development/Win32/packaging/icons
+				${TOP_SRC_DIR}/src/lyxwinres.rc -o ${CMAKE_CURRENT_BINARY_DIR}/lyxwinres.coff)
+		set(FILE_RC_COMPILED ${CMAKE_CURRENT_BINARY_DIR}/lyxwinres.coff)
+	else()
+		set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
+		message(STATUS "Using icon defined in resource file: ${FILE_RC}")
+	endif()
 endif()
 
 lyx_find_info_files(LyXInfoFiles ${TOP_SRC_DIR}/*)
 lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.txt)
 lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.cmake)
@@ -113,10 +123,11 @@ add_executable(${_lyx}
 	${LYX_BUILD_BUNDLE}
 	${lyx_sources}
 	${lyx_headers}
 	${vld_files}
 	${FILE_RC}
+	${FILE_RC_COMPILED}
 	${lyx_info_files}
 	${lyx_cmake_files}
 	${OSX_BUNDLE_FILES}
 )
 
@@ -131,10 +142,11 @@ target_link_libraries(${_lyx}
 	insets
 	frontends
 	frontend_qt
 	graphics
 	support
+	${FILE_RC_COMPILED}
 	${MYTHESLIB_LIBRARY}
 	${ICONV_LIBRARY}
 	${LYX_QTMAIN_LIBRARY}
 	${vld_dll})
 
diff --git a/src/frontends/qt4/GuiSearch.cpp b/src/frontends/qt4/GuiSearch.cpp
index 4e0c354..7ee192d 100644
--- a/src/frontends/qt4/GuiSearch.cpp
+++ b/src/frontends/qt4/GuiSearch.cpp
@@ -75,15 +75,25 @@ GuiSearch::GuiSearch(GuiView & lv)
 
 
 void GuiSearch::showEvent(QShowEvent * e)
 {
 	findPB->setFocus();
-	findCO->lineEdit()->selectAll();
 	GuiDialog::showEvent(e);
 }
 
 
+bool GuiSearch::event(QEvent * e)
+{
+	// need to handle the event here since there isn't an event-specific function
+	if (e->type() == QEvent::WindowActivate) {
+		findCO->lineEdit()->selectAll();
+	}
+	// not returning true because in addition we want Qt to process the event normally
+	return QWidget::event(e);
+}
+
+
 void GuiSearch::findChanged()
 {
 	if (findCO->currentText().isEmpty()) {
 		findPB->setEnabled(false);
 		replacePB->setEnabled(false);
diff --git a/src/frontends/qt4/GuiSearch.h b/src/frontends/qt4/GuiSearch.h
index b565553..d755276 100644
--- a/src/frontends/qt4/GuiSearch.h
+++ b/src/frontends/qt4/GuiSearch.h
@@ -32,10 +32,11 @@ private Q_SLOTS:
 	void replaceClicked();
 	void replaceallClicked();
 
 private:
 	void showEvent(QShowEvent * e);
+	bool event(QEvent * e);
 	///
 	bool initialiseParams(std::string const &) { return true; }
 	void clearParams() {}
 	void dispatchParams() {}
 	bool isBufferDependent() const { return true; }

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to