Wireshark-commits: [Wireshark-commits] master acde1e6: configure.ac: openSUSE build fix
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: Sun, 31 May 2015 13:54:15 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=acde1e6f37c5ce2dd3b5cf3d4afc11bc3ebc6d53
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

acde1e6 by Bart Van Assche (bvanassche@xxxxxxx):

    configure.ac: openSUSE build fix
    
    For some Linux distro's (e.g. openSUSE) the Qt4 tools have no suffix
    and the Qt5 tools have the suffix "-qt5". On such systems search for
    the Qt5 tools first. This avoids that compilation fails with the
    following error message:
    
    In file included from follow_stream_dialog.cpp:23:0:
    ui_follow_stream_dialog.h: In member function 'void Ui_FollowStreamDialog::retranslateUi(QDialog*)':
    ui_follow_stream_dialog.h:152:110: error: 'UnicodeUTF8' is not a member of 'QApplication'
     e(QApplication::translate("FollowStreamDialog", "Follow Stream", 0, QApplicatio
                                                                         ^
    
    Bug: 11233
    Change-Id: I09ccdb6a74043b6d952814b74fec5d618e6e26aa
    Reviewed-on: https://code.wireshark.org/review/8686
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  28481cd   ams: fixed wrong offset calculation, adsstate has 2 bytes
    adds  acde1e6   configure.ac: openSUSE build fix


Summary of changes:
 configure.ac |  143 ++++++++++++++++++++++++----------------------------------
 1 file changed, 58 insertions(+), 85 deletions(-)