Wireshark-commits: [Wireshark-commits] master 494457d: Make OS X .app bundling work with Qt 5.5.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 13 Jul 2015 02:12:39 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=494457d3b55630595909d4db883e93f2d3f57986
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

494457d by Guy Harris (guy@xxxxxxxxxxxx):

    Make OS X .app bundling work with Qt 5.5.
    
    macdeployqt doesn't actually seem to deploy any of Qt into the app
    bundle, probably because we're using it in a fashion they didn't intend
    (i.e., not doing everything with *their* build tools), so we just extend
    our dependency-binding stuff to handle the Qt libraries, and copy over
    the Qt plugins ourselves.
    
    We also add the rpaths to the executables and libraries as part of the
    app bundle building process; I thought it'd fix macdeployqt's problem,
    but it didn't, however, it's probably cleaner to do it there anyway.
    
    Change-Id: I134c2b1a32e168e82de67f0b674d17167481d69a
    Reviewed-on: https://code.wireshark.org/review/9612
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  e920868   Revert "[MSVC2015] TRy to fix Warnings turned errors."
    adds  494457d   Make OS X .app bundling work with Qt 5.5.


Summary of changes:
 configure.ac                |   12 ++-----
 packaging/macosx/osx-app.sh |   80 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 77 insertions(+), 15 deletions(-)