diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2015-02-02 18:49:18 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-02-03 11:49:14 +0000 |
| commit | c5db8fc74a9d437a4e7c0af077aed7c1f1bd4e26 (patch) | |
| tree | f7d42e0be35dd0ed85e74eaecdbbad4f319bc1d1 /examples/widgets/tools/i18n/languagechooser.cpp | |
| parent | 611bcc3cd337fe77ea5d3b898d897582da6f7ee2 (diff) | |
Make it more obvious that Q_WS_ is dead code, and should perhaps be ported
We still have a bunch of Q_WS_ ifdefs in our code, which are easy to
mistake for Q_OS_ ifdefs when quickly scanning the code. By renaming
the ifdefs we make it clear that the code in question is dead.
In incremental follow-ups, we can then selectively either remove, or
port, the pieces that are dead code.
Change-Id: Ib5ef3e9e0662d321f179f3e25122cacafff0f41f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'examples/widgets/tools/i18n/languagechooser.cpp')
| -rw-r--r-- | examples/widgets/tools/i18n/languagechooser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp index 15cc906fb8..aa8fb6ba0c 100644 --- a/examples/widgets/tools/i18n/languagechooser.cpp +++ b/examples/widgets/tools/i18n/languagechooser.cpp @@ -43,7 +43,7 @@ #include "languagechooser.h" #include "mainwindow.h" -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC QT_BEGIN_NAMESPACE extern void qt_mac_set_menubar_merge(bool merge); QT_END_NAMESPACE @@ -82,7 +82,7 @@ LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent) mainLayout->addWidget(buttonBox); setLayout(mainLayout); -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC qt_mac_set_menubar_merge(false); #endif |