On Mac, moving down a paragraph should place the cursor at the end of the current...

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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index e1129162701548d3c01db26bfbd6332d35a2128b..fc42e9b9d6e0b2b079350f59e344aefcd6601263 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -16,9 +16,12 @@ ui_%.h: ui/%.ui
 
 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>" > $@ ; \
@@ -55,6 +58,7 @@ SOURCEFILES = \
        Action.cpp \
        BulletsModule.cpp \
        ButtonController.cpp \
+       CategorizedCombo.cpp \
        ColorCache.cpp \
        CustomizedWidgets.cpp \
        EmptyTable.cpp \
@@ -164,6 +168,7 @@ NOMOCHEADER = \
        GuiImage.h \
        GuiKeySymbol.h \
        GuiPainter.h \
+       GuiWorkArea_Private.h \
        LaTeXHighlighter.h \
        qt_i18n.h \
        qt_helpers.h \
@@ -172,6 +177,7 @@ NOMOCHEADER = \
 MOCHEADER = \
        Action.h \
        BulletsModule.h \
+       CategorizedCombo.h \
        CustomizedWidgets.h \
        EmptyTable.h \
        FancyLineEdit.h \
@@ -313,6 +319,7 @@ UIFILES = \
        PrefColorsUi.ui \
        PrefCompletionUi.ui \
        PrefConvertersUi.ui \
+       PrefDocHandlingUi.ui \
        PrefOutputUi.ui \
        PrefDisplayUi.ui \
        PrefEditUi.ui \