diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/widgets/graphicsview/boxes/scene.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/tools/i18n/languagechooser.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/graphicsview/boxes/scene.cpp b/examples/widgets/graphicsview/boxes/scene.cpp index a22ab5082f..9ac429c667 100644 --- a/examples/widgets/graphicsview/boxes/scene.cpp +++ b/examples/widgets/graphicsview/boxes/scene.cpp @@ -128,7 +128,7 @@ void ColorEdit::mousePressEvent(QMouseEvent *event) QColorDialog dialog(color, 0); dialog.setOption(QColorDialog::ShowAlphaChannel, true); // The ifdef block is a workaround for the beta, TODO: remove when bug 238525 is fixed -#ifdef Q_DEAD_CODE_FROM_QT4_MAC +#if 0 // Used to be included in Qt4 for Q_WS_MAC dialog.setOption(QColorDialog::DontUseNativeDialog, true); #endif dialog.move(280, 120); diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp index 9bdeec6613..83aafe6b8a 100644 --- a/examples/widgets/tools/i18n/languagechooser.cpp +++ b/examples/widgets/tools/i18n/languagechooser.cpp @@ -53,7 +53,7 @@ #include "languagechooser.h" #include "mainwindow.h" -#ifdef Q_DEAD_CODE_FROM_QT4_MAC +#if 0 // Used to be included in Qt4 for Q_WS_MAC QT_BEGIN_NAMESPACE extern void qt_mac_set_menubar_merge(bool merge); QT_END_NAMESPACE @@ -92,7 +92,7 @@ LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent) mainLayout->addWidget(buttonBox); setLayout(mainLayout); -#ifdef Q_DEAD_CODE_FROM_QT4_MAC +#if 0 // Used to be included in Qt4 for Q_WS_MAC qt_mac_set_menubar_merge(false); #endif |