diff options
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/graphicsview/boxes/scene.cpp | 4 | ||||
| -rw-r--r-- | examples/widgets/tools/i18n/languagechooser.cpp | 10 |
2 files changed, 0 insertions, 14 deletions
diff --git a/examples/widgets/graphicsview/boxes/scene.cpp b/examples/widgets/graphicsview/boxes/scene.cpp index d51124aed7..a9995efa27 100644 --- a/examples/widgets/graphicsview/boxes/scene.cpp +++ b/examples/widgets/graphicsview/boxes/scene.cpp @@ -128,10 +128,6 @@ void ColorEdit::mousePressEvent(QMouseEvent *event) QColor color(m_color); 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 -#if 0 // Used to be included in Qt4 for Q_WS_MAC - dialog.setOption(QColorDialog::DontUseNativeDialog, true); -#endif dialog.move(280, 120); if (dialog.exec() == QDialog::Rejected) return; diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp index 963165ff81..e61e4432e4 100644 --- a/examples/widgets/tools/i18n/languagechooser.cpp +++ b/examples/widgets/tools/i18n/languagechooser.cpp @@ -53,12 +53,6 @@ #include "languagechooser.h" #include "mainwindow.h" -#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 -#endif - LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent) : QDialog(parent, Qt::WindowStaysOnTopHint) { @@ -95,10 +89,6 @@ LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent) mainLayout->addWidget(buttonBox); setLayout(mainLayout); -#if 0 // Used to be included in Qt4 for Q_WS_MAC - qt_mac_set_menubar_merge(false); -#endif - setWindowTitle("I18N"); } |