osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Undo my personal disabling of the Qt download/build/install. 

I did that because I didn't want to wait a day for Qt to build, but
didn't intend to make that change in the official source.

In the longer term, we should perhaps change the script to download and
install a binary package; sadly, their installers can't be made 100%
command-line and automated, but, well, the CMake installer pops up a
dialog, too, and if you don't have Java installed, some of the configure
scripts that check for Java pop up non-blocking "do you want to install
Java?" dialogs from OS X.

Change-Id: I99781d5e54529955bf9363a7ee9d4122403fa955
Reviewed-on: https://code.wireshark.org/review/5032
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-10-31 12:27:30 -07:00
parent 3426ffa248
commit 29fda994e8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx-setup.sh
View File

@ -72,7 +72,7 @@ PKG_CONFIG_VERSION=0.28
#
# If you don't want to build with GTK+ at all, comment out both lines.
#
#QT_VERSION=5.2.1
QT_VERSION=5.2.1
GTK_VERSION=2.24.17
#GTK_VERSION=3.5.2
if [ "$GTK_VERSION" ]; then