diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-02-06 18:46:05 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-02-07 02:46:47 +0000 |
| commit | a7b15672477df3e87385fbef60dc72952925310e (patch) | |
| tree | 29dcd6e65fc38a429d911303dcd5e295b11b311b /macosx-setup.sh | |
| parent | ff858332356a365f028407b895bf2e86c737daa6 (diff) | |
Qt 5.2.1 - now with added native OS X toolbar!
To quote
https://qt.gitorious.org/qt/qtbase/source/62feb088a30045e7fbd2a3074c64d18035b84a97:dist/changes-5.2.1
"****************************************************************************
* Platform Specific Changes
*
****************************************************************************
...
OS X
----
- [QTBUG-34411] Implemented QMainWindow::setUnifiedTitleAndToolBarOnMac."
Also get rid of a commented-out setting of QT_VERSION to 5.1.1 while
we're at it.
Change-Id: I957fdfecb70954723cfd3160f40758f722dc56c8
Reviewed-on: https://code.wireshark.org/review/136
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 9e524d43a7..293809e839 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -73,8 +73,7 @@ PKG_CONFIG_VERSION=0.28 # # If you don't want to build with GTK+ at all, comment out both lines. # -#QT_VERSION=5.1.1 -QT_VERSION=5.2.0 +QT_VERSION=5.2.1 GTK_VERSION=2.24.17 #GTK_VERSION=3.5.2 if [ "$GTK_VERSION" ]; then |