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/main_status_bar.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/main_status_bar.cpp')
| -rw-r--r-- | ui/qt/main_status_bar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index 52ccb2a740..66e0453101 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -103,7 +103,7 @@ MainStatusBar::MainStatusBar(QWidget *parent) : QHBoxLayout *info_progress_hb = new QHBoxLayout(info_progress); QAction *action; -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) // Handles are the same color as widgets, at least on Windows 7. splitter->setHandleWidth(3); splitter->setStyleSheet(QString( @@ -112,7 +112,7 @@ MainStatusBar::MainStatusBar(QWidget *parent) : " border-right: 1px solid palette(mid);" "}" )); -#elif defined(Q_WS_MAC) +#elif defined(Q_OS_MAC) expert_status_.setAttribute(Qt::WA_MacSmallSize, true); #endif |