diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-06-15 18:17:20 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-06-15 18:17:20 +0000 |
commit | 304654f6881e38b69eb60cdb26913fd3d78b4752 (patch) | |
tree | 4655ace3b3c764a7fa879e8d3cb32e4f33de6af0 | |
parent | 1463b2b0c86e97ce98bec2b8a1b68a91da1d960a (diff) |
Don't install the Qt resource images. They get converted to C arrays in
qrc_*.cpp so they shouldn't be necessary even when we're building and
installing qtshark.
svn path=/trunk/; revision=43274
-rw-r--r-- | Makefile.am | 25 | ||||
-rw-r--r-- | ui/qt/Makefile.am | 5 | ||||
-rw-r--r-- | ui/qt/Makefile.common | 18 |
3 files changed, 22 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am index 1241d49a7e..46e620f4e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -268,30 +268,6 @@ ui_DATA = \ ui/gtk/ui/main-menubar-ui.xml # -# Install the ui/gt directory files in the "ui/qt" subdirectory -# of that directory -# -uiqtdir = $(pkgdatadir)/ui/qt -uiqt_DATA = \ - ui/qt/capture_start_24.png \ - ui/qt/capture_start_active_24.png \ - ui/qt/capture_stop_24.png \ - ui/qt/dfilter_apply_hover.png \ - ui/qt/dfilter_apply_normal.png \ - ui/qt/dfilter_apply_pressed.png \ - ui/qt/dfilter_bookmark_hover.png \ - ui/qt/dfilter_bookmark_normal.png \ - ui/qt/dfilter_bookmark_pressed.png \ - ui/qt/dfilter_dropdown.png \ - ui/qt/dfilter_erase_active.png \ - ui/qt/dfilter_erase_normal.png \ - ui/qt/dfilter_erase_selected.png \ - ui/qt/dfilter_refresh_active.png \ - ui/qt/dfilter_refresh_normal.png \ - ui/qt/display_filter_16.svg \ - ui/qt/gpl-template.txt - -# # Install the wimaxasncp directory files in the "wimaxasncp" subdirectory # of that directory # @@ -831,7 +807,6 @@ EXTRA_DIST = \ $(radius_DATA) \ $(tpncp_DATA) \ $(ui_DATA) \ - $(uiqt_DATA) \ $(wimaxasncp_DATA) \ randpkt.c \ smi_modules \ diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index c143eaacca..19791bb74c 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -126,9 +126,12 @@ remote_icons.h: # Makefile.nmake EXTRA_DIST = \ $(GENERATOR_FILES) \ + $(QRC_IMAGES) \ CMakeLists.txt \ doxygen.cfg.in \ main.cpp \ Makefile.common \ Makefile_custom.common \ - main_window.ui + main_window.ui \ + display_filter_16.svg \ + gpl-template.txt diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 12c5ec7f48..da4d7d6a14 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -104,6 +104,24 @@ MOC_SRC = $(MOC_HDRS:.h=.moc.cpp) # # .qrc files. # +# Should QRC_FILES or QRC_SRC depend on QRC_IMAGES? +QRC_IMAGES = \ + capture_start_24.png \ + capture_start_active_24.png \ + capture_stop_24.png \ + dfilter_apply_hover.png \ + dfilter_apply_normal.png \ + dfilter_apply_pressed.png \ + dfilter_bookmark_hover.png \ + dfilter_bookmark_normal.png \ + dfilter_bookmark_pressed.png \ + dfilter_dropdown.png \ + dfilter_erase_active.png \ + dfilter_erase_normal.png \ + dfilter_erase_selected.png \ + dfilter_refresh_active.png \ + dfilter_refresh_normal.png + QRC_FILES = \ display_filter.qrc \ i18n.qrc \ |