Don't allow newline characters in preference (#5840).

[lyx.git] / src / frontends / qt4 / Makefile.am

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index caa41159ae84c52362091f43e8fca1e5052024d5..4923ba3d857433c5de6a84a2a244ff44bdaf9d90 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -10,13 +10,18 @@ CLEANFILES += $(BUILT_SOURCES)
 # Use _() for localization instead of tr() or trUtf8()
 UIC4FLAGS=-tr lyx::qt_
 
+# The ui_%.h pattern must match the filter in ../../../po/Rules-lyx
 ui_%.h: ui/%.ui
        $(AM_V_GEN)$(UIC4) $(UIC4FLAGS) $< -o $@
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
+QT_VERSION = $(shell IFS=.; set -- `echo $(QT4_VERSION)`; \
+            echo 0x0`echo "obase=16; $$1*65536+$$2*256+$$3" | bc`)
+
+# The moc_%.cpp pattern must match the filter in ../../../po/Rules-lyx
 moc_%.cpp: %.h
-       $(AM_V_GEN)$(MOC4) -o $@ $<
+       $(AM_V_GEN)$(MOC4) -DQT_VERSION=$(QT_VERSION) -o $@ $<
 
 Resources.qrc: Makefile
        $(AM_V_GEN)echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@ ; \
@@ -56,6 +61,7 @@ SOURCEFILES = \
        ColorCache.cpp \
        CustomizedWidgets.cpp \
        EmptyTable.cpp \
+       FancyLineEdit.cpp \
        FileDialog.cpp \
        FindAndReplace.cpp \
        FloatPlacement.cpp \
@@ -171,6 +177,7 @@ MOCHEADER = \
        BulletsModule.h \
        CustomizedWidgets.h \
        EmptyTable.h \
+       FancyLineEdit.h \
        FindAndReplace.h \
        FloatPlacement.h \
        GuiAbout.h \