anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* do not pass headers without Q_OBJECT through moc

Browse Source 
* make sure Resource.* files are cleaned as needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22834 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2008-02-07 13:45:40 +00:00
parent 6a082a6d89
commit b21b3b346d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontends/qt4/Makefile.am
View File

@ -1,12 +1,11 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
CLEANFILES += $(UIFILES:%.ui=ui_%.h)
CLEANFILES += $(MOCEDFILES)
BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h) BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h)
BUILT_SOURCES += $(MOCEDFILES) BUILT_SOURCES += $(MOCEDFILES)
BUILT_SOURCES += Resources.cpp Resources.qrc BUILT_SOURCES += Resources.cpp Resources.qrc
CLEANFILES += $(BUILT_SOURCES)
######################### Qt stuff ############################# ######################### Qt stuff #############################
# Use _() for localization instead of tr() or trUtf8() # Use _() for localization instead of tr() or trUtf8()
UIC4FLAGS=-tr lyx::qt_ UIC4FLAGS=-tr lyx::qt_
@ -137,22 +136,27 @@ SOURCEFILES = \
NOMOCHEADER = \ NOMOCHEADER = \
ButtonController.h \ ButtonController.h \
ColorCache.h \
DockView.h \
FileDialog.h \ FileDialog.h \
GuiFontExample.h \
GuiFontLoader.h \ GuiFontLoader.h \
GuiFontMetrics.h \ GuiFontMetrics.h \
GuiIdListModel.h \
GuiImage.h \ GuiImage.h \
GuiKeySymbol.h \
GuiMath.h \ GuiMath.h \
GuiPainter.h \ GuiPainter.h \
GuiToolbars.h \ GuiToolbars.h \
LaTeXHighlighter.h \
qlkey.h \
qt_helpers.h qt_helpers.h
MOCHEADER = \ MOCHEADER = \
Action.h \ Action.h \
BulletsModule.h \ BulletsModule.h \
ColorCache.h \
CustomizedWidgets.h \ CustomizedWidgets.h \
DialogView.h \ DialogView.h \
DockView.h \
EmptyTable.h \ EmptyTable.h \
FloatPlacement.h \ FloatPlacement.h \
GuiAbout.h \ GuiAbout.h \
@ -175,13 +179,10 @@ MOCHEADER = \
GuiERT.h \ GuiERT.h \
GuiExternal.h \ GuiExternal.h \
GuiFloat.h \ GuiFloat.h \
GuiFontExample.h \
GuiGraphics.h \ GuiGraphics.h \
GuiHyperlink.h \ GuiHyperlink.h \
GuiIdListModel.h \
GuiInclude.h \ GuiInclude.h \
GuiIndex.h \ GuiIndex.h \
GuiKeySymbol.h \
GuiListings.h \ GuiListings.h \
GuiLog.h \ GuiLog.h \
GuiMathMatrix.h \ GuiMathMatrix.h \
@ -215,10 +216,8 @@ MOCHEADER = \
InsertTableWidget.h \ InsertTableWidget.h \
LengthCombo.h \ LengthCombo.h \
LyXFileDialog.h \ LyXFileDialog.h \
LaTeXHighlighter.h \
Menus.h \ Menus.h \
PanelStack.h \ PanelStack.h \
qlkey.h \
TocModel.h \ TocModel.h \
TocWidget.h \ TocWidget.h \
Validator.h Validator.h