diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-02 19:00:37 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-03 09:10:20 +0000 |
| commit | eeafb47a126c1417f5b9810454b8d2206859fd40 (patch) | |
| tree | 22aa45885873691a036520855b070b82f7b90442 /ui | |
| parent | 640209215ebfb0541678cddf59304ea395937402 (diff) | |
| download | wireshark-eeafb47a126c1417f5b9810454b8d2206859fd40.tar.gz | |
Fix Qt4 moc option argument and add build parametrization
Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2
Reviewed-on: https://code.wireshark.org/review/13671
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ui/qt/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index fca5ae25b8..23758df588 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -457,7 +457,7 @@ if (QT_VERSION EQUAL 5) QT5_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI}) # For now, do the moc stuff manually QT5_WRAP_CPP(WIRESHARK_QT_MOC_SRC ${WIRESHARK_QT_HEADERS} - OPTIONS --no-notes) + OPTIONS ${MOC_OPTIONS}) # Starting with cmake 2.8.6, we may also use # set(CMAKE_AUTOMOC TRUE) # or @@ -468,7 +468,7 @@ else() QT4_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI}) # For now, do the moc stuff manually QT4_WRAP_CPP(WIRESHARK_QT_MOC_SRC ${WIRESHARK_QT_HEADERS} - OPTIONS --no-notes) + OPTIONS ${MOC_OPTIONS}) # Starting with cmake 2.8.6, we may also use # set(CMAKE_AUTOMOC TRUE) # or diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 8a085cbd54..6b9657c12d 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -96,7 +96,7 @@ am__v_UIC_0 = @echo " UIC " $@; SUFFIXES = .moc.cpp .qrc .rcc.cpp .h.moc.cpp: - $(AM_V_MOC)$(MOC) --no-notes -I.. -I../.. -o $@ $< + $(AM_V_MOC)$(MOC) $(MOC_OPTIONS) -I.. -I../.. -o $@ $< .qrc.rcc.cpp: $(MKDIR_P) $(@D) |