Update the documentation to use "Wireshark.pro".

Change-Id: I024a882030e489cbd273a4245b0cd3be656f060f
Reviewed-on: https://code.wireshark.org/review/4191
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-09-19 08:44:58 -07:00 committed by Gerald Combs
parent a58c986f62
commit cbe7741926
2 changed files with 12 additions and 18 deletions

View File

@ -214,13 +214,13 @@ http://www.parashift.com/c++-faq/mixing-c-and-cpp.html
Qt makes translating the Wireshark UI into different languages easy.
- Add your translation (qtshark_XX.ts) in QtShark.pro, i18n.qrc, ui/qt/Makefile.common
- Add your translation (wireshark_XX.ts) in Wireshark.pro, i18n.qrc, ui/qt/Makefile.common
and ui/qt/CMakeList.txt .
- Add also in epan/prefs.c, in ui/qt/main.cpp add case in switch(prefs_p->gui_qt_language)
and in main_windows_preferences_frame.ui (use qt-design) to add in prefs.
- Run "lupdate QtShark.pro" to generate/update your translation file.
- Run "lupdate Wireshark.pro" to generate/update your translation file.
- Translate with Qt Linguist.
- Run "lrelease QtShark.pro" to create/update qtshark_xx.qm file.
- Run "lrelease Wireshark.pro" to create/update wireshark_xx.qm file.
- Push your translation to Gerrit for review ("git push").
More information about Qt Linguist

View File

@ -112,16 +112,16 @@ problems.
[[ChSetupQt]]
==== Install Qt (optional but recommended)
==== Install Qt
If you wish to build QtShark (The Wireshark GUI using the Qt windowing
toolkit), http://qt-project.org/downloads[download] and install the appropriate
Qt libraries.
The main Wireshark application uses the Qt windowing toolkit. The installation
package is quite large and you must currently
http://qt-project.org/downloads[download] and install it separately.
Note that the Qt package also includes the Qt Creator IDE, which may be useful
for designing graphical components, and includes an interactive debugger.
for designing graphical components and includes an interactive debugger.
You'll need to build wireshark using nmake before you'll be able to build the
QtShark project (ui/qt/QtShark.pro), however.
Wireshark project (ui/qt/Wireshark.pro), however.
[WARNING]
.Don't use the default full-package Qt installer
@ -134,14 +134,6 @@ OpenGL) if you are using the toolchain set up by these quick-start
instructions).
====
[TIP]
.Qt migration
====
As the GTK+ version of Wireshark is being deprecated in favor of the Qt
version, it is a good idea to build QtShark and ensure that any features that
you've added work in that version.
====
[[ChSetupCygwin]]
@ -566,7 +558,9 @@ to build Wireshark.
. Wait for Wireshark to compile. This will take a while.
. Run `C:\wireshark\wireshark-gtk2\wireshark.exe` and make sure it starts. s
. Run `C:\wireshark\wireshark-qt-release\wireshark.exe` and make sure it starts. s
//. Run `C:\wireshark\wireshark-gtk2\wireshark-gtk.exe` and make sure it starts. s
. Open 'Help -> About'. If it shows your "private" program
version, e.g.: Version wireshark-major-minor-version:[].x-myprotocol123