diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-04-24 11:07:25 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-04-24 11:07:25 +0000 |
commit | 9db6d700cde9bcc88c00c86e5439079e06911c2a (patch) | |
tree | 4a88c9323f23a1e22234307e739af20c3b7a427a /ui/qt/export_dissection_dialog.h | |
parent | 2616e091409ba18c6f241a274e2af9d5e13853b0 (diff) | |
download | wireshark-9db6d700cde9bcc88c00c86e5439079e06911c2a.tar.gz wireshark-9db6d700cde9bcc88c00c86e5439079e06911c2a.tar.bz2 wireshark-9db6d700cde9bcc88c00c86e5439079e06911c2a.zip |
The porting guide for Qt5 requires that Q_OS_ be used instead
of Q_WS_ in Qt4 projects
See:
http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html
svn path=/trunk/; revision=49013
Diffstat (limited to 'ui/qt/export_dissection_dialog.h')
-rw-r--r-- | ui/qt/export_dissection_dialog.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/qt/export_dissection_dialog.h b/ui/qt/export_dissection_dialog.h index 7e65a62abc..09a9e83a57 100644 --- a/ui/qt/export_dissection_dialog.h +++ b/ui/qt/export_dissection_dialog.h @@ -33,10 +33,10 @@ #include "ui/file_dialog.h" -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN #include "packet_range_group_box.h" #include "packet_format_group_box.h" -#endif // Q_WS_WIN +#endif // Q_OS_WIN #include <QFileDialog> #include <QMap> @@ -53,16 +53,16 @@ public slots: int exec(); private slots: -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN void exportTypeChanged(QString name_filter); void checkValidity(); void on_buttonBox_helpRequested(); -#endif // Q_WS_WIN +#endif // Q_OS_WIN private: export_type_e export_type_; capture_file *cap_file_; -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN print_args_t print_args_; QMap<QString, export_type_e> export_type_map_; @@ -71,7 +71,7 @@ private: PacketFormatGroupBox packet_format_group_box_; QPushButton *save_bt_; -#endif // Q_WS_WIN +#endif // Q_OS_WIN }; #endif // EXPORT_DISSECTION_DIALOG_H |