Wireshark-commits: [Wireshark-commits] master-2.0 b33f4c8: Switch from QLibrary to ws_load_library.

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 2 Feb 2016 01:12:19 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b33f4c8c610e469b456b089c407b5b55ce4ab1ec
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

b33f4c8 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Switch from QLibrary to ws_load_library.
    
    From the comments in qlibrary_win.cpp:
    
    // We make the following attempts at locating the library:
    [ ... ]
    // Windows
    // if (absolute)
    //     fileName
    //     fileName + ".dll"
    // else
    //     fileName + ".dll"
    //     fileName
    
    We were passing "riched20.dll" to QLibrary, which meant that it searched
    for "riched20.dll.dll" first.
    
    Switch to ws_load_library, which we use elsewhere and which has much
    safer default behavior.
    
    Conflicts:
    	ui/qt/wireshark_application.cpp
    
    Change-Id: Ic8f0cf5686c9b1856d37e76be4404d6236c076e5
    Reviewed-on: https://code.wireshark.org/review/13607
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 4a79cf2e1ab056faaddd252aa56520435b318a56)
    Reviewed-on: https://code.wireshark.org/review/13656
    

Actions performed:

    from  214f040   Make Qt UI capture filter behavior more closely match the GTK+ UI.
    adds  b33f4c8   Switch from QLibrary to ws_load_library.


Summary of changes:
 ui/gtk/main.c                   |    2 +-
 ui/qt/wireshark_application.cpp |   17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)