diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | ui/qt/Makefile.am | 33 | ||||
| -rw-r--r-- | ui/qt/Makefile.common | 22 |
3 files changed, 39 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore index 462e7d8aac..b7875b896f 100644 --- a/.gitignore +++ b/.gitignore @@ -179,7 +179,6 @@ wsar_html.zip # Qt # ###### qtshark -*.rcc.cpp /ui/qt/__/ /ui/qt/*.qrc.depends /ui/qt/*.pro.user @@ -187,6 +186,7 @@ qtshark /ui/qt/moc_*.cpp /ui/qt/moc_*.cpp_parameters /ui/qt/*.moc.cpp +/ui/qt/*.rcc.cpp /ui/qt/moc_*.cxx /ui/qt/qrc_*.cpp /ui/qt/qrc_*.cxx diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 5683b06715..8c0c6b47e6 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -31,7 +31,7 @@ CLEANFILES = \ wireshark-tap-register.c-tmp \ wireshark-tap-register-cache.pkl \ *.moc.cpp \ - *.rrc.cpp \ + qrc_*.cpp \ ui_*.h *~ @@ -93,22 +93,37 @@ am__v_UIC_0 = @echo " UIC " $@; # building .rcc.cpp files from .qrc files by running rcc, # and building ui_XXX.h files from .ui files by running uic. # -SUFFIXES = .moc.cpp .qrc .rcc.cpp +SUFFIXES = .moc.cpp +# +# The Qt toolchain uses the naming convention moc_FOO.cpp. Should we do the same? +#moc_%.cpp: %.h +# $(MOC) $< -o $@ +# .h.moc.cpp: $(AM_V_MOC)$(MOC) $(MOC_OPTIONS) -I.. -I../.. -o $@ $< -.qrc.rcc.cpp: - $(MKDIR_P) $(@D) - $(AM_V_RCC)$(RCC) -name `basename $< .qrc` -o $@ $< +qrc_about.cpp: ../../image/about.qrc + $(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name about -o $@ $< + +qrc_layout.cpp: ../../image/layout.qrc + $(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name layout -o $@ $< + +qrc_languages.cpp: ../../image/languages/languages.qrc + $(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name languages -o $@ $< + +qrc_i18n.cpp: i18n.qrc + $(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name i18n -o $@ $< + +qrc_toolbar.cpp: ../../image/toolbar.qrc + $(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name toolbar -o $@ $< + +qrc_wsicon.cpp: ../../image/wsicon.qrc + $(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name wsicon -o $@ $< ui_%.h: %.ui $(AM_V_UIC)$(UIC) $< -o $@ -# The Qt toolchain uses the naming convention moc_FOO.cpp. Should we do the same? -#moc_%.cpp: %.h -# $(MOC) $< -o $@ - # # Explicit dependencies to force the ui_ headers to be built. # See "Recording Dependencies manually" in the "Built Sources" diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 6919eeb1bc..24428a020f 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -383,6 +383,20 @@ QRC_FILES = \ i18n.qrc # +# The .cpp files generated from them. +# We do *not* include these in the distribution; if you have the Qt SDK +# installed, so that you can build Qt-based applications, you have rcc +# installed. +# +QRC_SRC = \ + qrc_about.cpp \ + qrc_languages.cpp \ + qrc_layout.cpp \ + qrc_toolbar.cpp \ + qrc_wsicon.cpp \ + qrc_i18n.cpp + +# # .ts files. # wireshark_en should be pluralonly. # @@ -401,14 +415,6 @@ TS_FILES = \ # Should they be auto-generated ? QM_FILES = $(TS_FILES:.ts=.qm) -# -# The .rcc.cpp files generated from them. -# We do *not* include these in the distribution; if you have the Qt SDK -# installed, so that you can build Qt-based applications, you have moc -# installed. -# -QRC_SRC = $(QRC_FILES:.qrc=.rcc.cpp) - WIRESHARK_QT_SRC = \ about_dialog.cpp \ accordion_frame.cpp \ |