diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-31 12:27:30 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-31 19:30:47 +0000 |
| commit | 29fda994e8e6b35024ce03083cca735f101ebd1e (patch) | |
| tree | 3a6ee2ce614641a7b485af95aa92c4e18810db31 /macosx-setup.sh | |
| parent | 3426ffa248780f3bc1a1bdefa225d2255c4db3af (diff) | |
| download | wireshark-29fda994e8e6b35024ce03083cca735f101ebd1e.tar.gz | |
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>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index e042ffd73e..36b10b360e 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -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 |