Wireshark-commits: [Wireshark-commits] master-2.0 a5d4dbd: Revert "Revert "Qt: Add support of gui.w

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 30 Dec 2015 01:18:33 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a5d4dbd49d0e1fb2b123004a4e65dba2158d6e07
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

a5d4dbd by Guy Harris (guy@xxxxxxxxxxxx):

    Revert "Revert "Qt: Add support of gui.window_title""
    
    Next, cherry picking the OS X build fix.
    
    This reverts commit e0c78b44480735686571010a2a4bbdaea480946e.
    
    Change-Id: I3c159c6faa6591d5ac33a6cad8d48deeb6c159a8
    Reviewed-on: https://code.wireshark.org/review/12937
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  153dcec   Revert "Revert "Qt: Remove usage of setWindowFilePath""
    adds  a5d4dbd   Revert "Revert "Qt: Add support of gui.window_title""


Summary of changes:
 ui/qt/main_window.cpp       |   25 +++++++++++++++++--------
 ui/qt/main_window.h         |    3 ++-
 ui/qt/main_window_slots.cpp |    2 +-
 wireshark-qt.cpp            |    2 ++
 4 files changed, 22 insertions(+), 10 deletions(-)