Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 1f61639b6ad8f1ac58f8305941ab6ba892cfb717..5473e393f1fc4f1b96bcbdc0044cd16850b78206 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -10,17 +10,22 @@ 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>" > $@ ; \
-       find $(top_srcdir)/lib/images -name '*.png' \
+       find $(top_srcdir)/lib/images -name '*.png' -o -name '*.gif' \
                | sed -e 's:$(top_srcdir)/lib/\(.*\):<file alias="\1">&</file>:' \
                >> $@ ;\
        echo "</qresource></RCC>" >> $@
@@ -56,6 +61,7 @@ SOURCEFILES = \
        ColorCache.cpp \
        CustomizedWidgets.cpp \
        EmptyTable.cpp \
+       FancyLineEdit.cpp \
        FileDialog.cpp \
        FindAndReplace.cpp \
        FloatPlacement.cpp \
@@ -74,6 +80,7 @@ SOURCEFILES = \
        GuiCommandBuffer.cpp \
        GuiCommandEdit.cpp \
        GuiCompare.cpp \
+       GuiCompareHistory.cpp \
        GuiCompleter.cpp \
        GuiDelimiter.cpp \
        GuiDialog.cpp \
@@ -95,10 +102,11 @@ SOURCEFILES = \
        GuiInfo.cpp \
        GuiKeySymbol.cpp \
        GuiLabel.cpp \
+       GuiLine.cpp \
        GuiListings.cpp \
        GuiLog.cpp \
        GuiMathMatrix.cpp \
-       GuiNomencl.cpp \
+       GuiNomenclature.cpp \
        GuiNote.cpp \
        GuiPainter.cpp \
        GuiParagraph.cpp \
@@ -130,6 +138,7 @@ SOURCEFILES = \
        GuiWorkArea.cpp \
        GuiWrap.cpp \
        IconPalette.cpp \
+       InGuiThread.cpp \
        InsertTableWidget.cpp \
        InsetParamsDialog.cpp \
        InsetParamsWidget.cpp \
@@ -158,6 +167,7 @@ NOMOCHEADER = \
        GuiImage.h \
        GuiKeySymbol.h \
        GuiPainter.h \
+       GuiWorkArea_Private.h \
        LaTeXHighlighter.h \
        qt_i18n.h \
        qt_helpers.h \
@@ -168,6 +178,7 @@ MOCHEADER = \
        BulletsModule.h \
        CustomizedWidgets.h \
        EmptyTable.h \
+       FancyLineEdit.h \
        FindAndReplace.h \
        FloatPlacement.h \
        GuiAbout.h \
@@ -184,6 +195,7 @@ MOCHEADER = \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \
        GuiCompare.h \
+       GuiCompareHistory.h \
        GuiCompleter.h \
        GuiDelimiter.h \
        GuiDialog.h \
@@ -199,10 +211,11 @@ MOCHEADER = \
        GuiIndices.h \
        GuiInfo.h \
        GuiLabel.h \
+       GuiLine.h \
        GuiListings.h \
        GuiLog.h \
        GuiMathMatrix.h \
-       GuiNomencl.h \
+       GuiNomenclature.h \
        GuiNote.h \
        GuiParagraph.h \
        GuiPhantom.h \
@@ -233,6 +246,7 @@ MOCHEADER = \
        GuiWorkArea.h \
        GuiWrap.h \
        IconPalette.h \
+       InGuiThread.h \
        InsertTableWidget.h \
        InsetParamsDialog.h \
        InsetParamsWidget.h \
@@ -259,7 +273,9 @@ UIFILES = \
        ChangesUi.ui \
        CharacterUi.ui \
        CitationUi.ui \
+       ColorUi.ui \
        CompareUi.ui \
+       CompareHistoryUi.ui \
        DelimiterUi.ui \
        DocumentUi.ui \
        ErrorListUi.ui \
@@ -279,8 +295,10 @@ UIFILES = \
        LabelUi.ui \
        LanguageUi.ui \
        LaTeXUi.ui \
+       LineUi.ui \
        ListingsUi.ui \
        ListingsSettingsUi.ui \
+       LocalLayoutUi.ui \
        LogUi.ui \
        MarginsUi.ui \
        MasterChildUi.ui \
@@ -299,7 +317,7 @@ UIFILES = \
        PrefColorsUi.ui \
        PrefCompletionUi.ui \
        PrefConvertersUi.ui \
-       PrefDateUi.ui \
+       PrefOutputUi.ui \
        PrefDisplayUi.ui \
        PrefEditUi.ui \
        PrefFileformatsUi.ui \
@@ -308,7 +326,6 @@ UIFILES = \
        PrefLanguageUi.ui \
        PrefLatexUi.ui \
        PrefPathsUi.ui \
-       PrefPlaintextUi.ui \
        PrefPrinterUi.ui \
        PrefScreenFontsUi.ui \
        PrefShortcutsUi.ui \