Wireshark-commits: [Wireshark-commits] master-2.6 32d609e: cmake: remove dependency of i18n.qrc on

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 25 Jun 2018 22:01:53 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=32d609ee3b8320597ce35120276abb5f72279ad8
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

32d609e by Peter Wu (peter@xxxxxxxxxxxxx):

    cmake: remove dependency of i18n.qrc on .qm files
    
    The i18n.qrc file is generated at cmake time while the .qm files are
    also built as dependency of the AUTORCC process. The extraneous .qm
    dependency of i18n.qrc possibly causes duplicate wireshark_zh_CN.qm
    builds (see v2.9.0rc0-605-g644939ed9e), so remove it.
    
    Change-Id: I629e7b809486a65b27158f66a7e62cfcf61657d3
    Reviewed-on: https://code.wireshark.org/review/27633
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 71a240d6118c99eb2e918d71e81164808bd64a29)
    Reviewed-on: https://code.wireshark.org/review/28433
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  a226168   CMake: try to fix duplicate qm builds on Windows
    adds  32d609e   cmake: remove dependency of i18n.qrc on .qm files


Summary of changes:
 ui/qt/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)