Wireshark · Wireshark-commits: [Wireshark-commits] master f8092f9: Qt: Move wireshark-qt.cpp back to ui/qt/main.cpp.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f8092f96b373f851eb91ae2ff94581bcba8d0279
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

f8092f9 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Move wireshark-qt.cpp back to ui/qt/main.cpp.
    
    The Qt UI's main module started out as ui/qt/main.cpp but was moved to
    the top-level directory in order to appease Autotools. We don't need to
    do that any more, so move it back.
    
    Change-Id: Ic5bc0ed5b754e36cc2b9e682f2ca097781233dfd
    Reviewed-on: https://code.wireshark.org/review/28090
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  37119e5   FP: Migrating some fields to add_item_ret
    adds  f8092f9   Qt: Move wireshark-qt.cpp back to ui/qt/main.cpp.


Summary of changes:
 CMakeLists.txt                                       | 2 +-
 docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc | 2 +-
 image/wireshark.exe.manifest.in                      | 2 +-
 tools/update-tx                                      | 3 +--
 ui/qt/CMakeLists.txt                                 | 1 +
 wireshark-qt.cpp => ui/qt/main.cpp                   | 2 +-
 ui/qt/main_window.cpp                                | 2 +-
 ui/qt/widgets/wireshark_file_dialog.h                | 4 ++--
 ui/win32/file_dlg_win32.h                            | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename wireshark-qt.cpp => ui/qt/main.cpp (99%)