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/preferences_dialog.cpp | |
parent | 2616e091409ba18c6f241a274e2af9d5e13853b0 (diff) | |
download | wireshark-9db6d700cde9bcc88c00c86e5439079e06911c2a.tar.gz |
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/preferences_dialog.cpp')
-rw-r--r-- | ui/qt/preferences_dialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index 8332b37025..c8cb6dbffe 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -337,7 +337,7 @@ void PreferencesDialog::showEvent(QShowEvent *evt) int new_prefs_tree_width = pd_ui_->prefsTree->style()->subElementRect(QStyle::SE_TreeViewDisclosureItem, &style_opt).left(); QList<int> sizes = pd_ui_->splitter->sizes(); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN new_prefs_tree_width *= 2; #endif pd_ui_->prefsTree->resizeColumnToContents(0); |