aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-06-29 18:39:45 -0700
committerGuy Harris <guy@alum.mit.edu>2016-06-30 01:40:17 +0000
commitb4e847996ba6da8ccda3d5719b19f712157fd026 (patch)
tree24c050d3a8fd69f5bbfcfe461b0eb9a88d0d754f /doc
parent73e414de3fb5c75b4e87d98c42b95bfc38f2c3cf (diff)
Mention autotools, give some information for other UN*Xes.
For OS X, mention the use of CMake or autotools for building. For Linux, mention autotools as well as CMake, and speak of Debian derivatives other than Ubuntu. Add a section for UN*Xes other than OS X and Linux. Change-Id: I73bb7afe2d427333b10016aeb497ab32eee16d43 Reviewed-on: https://code.wireshark.org/review/16217 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'doc')
-rw-r--r--doc/README.qt26
1 files changed, 23 insertions, 3 deletions
diff --git a/doc/README.qt b/doc/README.qt
index c9d1cb95ec..74b1457a08 100644
--- a/doc/README.qt
+++ b/doc/README.qt
@@ -60,6 +60,9 @@ http://www.qt.io/download-open-source/. Qt 5.2 and later include
Qt Mac Extras (http://doc.qt.io/qt-5/qtmacextras-index.html), which
provides a better look and feel.
+Build the top-level directory using CMake or autotools (see section
+"Getting up and running" above).
+
1.1.2 Windows
Download the Qt online installer from http://www.qt.io/download-open-source/
@@ -109,9 +112,26 @@ XXX: (WMeier): I've not had too much satisfaction using the "native Windows debu
1.1.3 Linux
Install the Qt libraries and Qt Creator via your package manager or from
-http://qt-project.org/downloads/. On Debian and Ubuntu the "qt-sdk" (and qttools5-dev when use Qt5) meta-package
-should provide everything you need. Build the top-level directory using CMake
-(see section "Using cmake" above).
+http://qt-project.org/downloads/. On Debian, Ubuntu, and other Debian
+derivatives, the "qt-sdk" (and qttools5-dev when use Qt5) meta-package
+should provide everything you need.
+
+Build the top-level directory using CMake or autotools (see section
+"Getting up and running" above).
+
+1.1.4 Other UN*Xes
+
+For the *BSDs, if the ports collection/packages collection has Qt,
+install the Qt libraries and Qt Creator via packages.
+
+For Solaris, install the Qt libraries and Qt Creator via OpenCSW or, for
+Solaris 11, the Image Packaging System.
+
+Otherwise, download the source from http://qt-project.org/downloads/ and
+compile and install it.
+
+Build the top-level directory using CMake or autotools (see section
+"Getting up and running" above).
1.2 Other tools