3 files changed, 0 insertions, 61 deletions
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index d2b3ef240b..aa117ed7de 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -69,11 +69,7 @@ namespace QTest
         QEvent::Type type;
         type = press ? QEvent::KeyPress : QEvent::KeyRelease;
         qt_handleKeyEvent(window, type, code, modifier, text, repeat, delay);
-#ifdef QT_MAC_USE_COCOA
-        QTest::qWait(20);
-#else
         qApp->processEvents();
-#endif
     }
 
     static void sendKeyEvent(KeyAction action, QWindow *window, Qt::Key code,
diff --git a/src/widgets/doc/snippets/macmainwindow.mm b/src/widgets/doc/snippets/macmainwindow.mm
index d0d74631ab..3e1ee7ca51 100644
--- a/src/widgets/doc/snippets/macmainwindow.mm
+++ b/src/widgets/doc/snippets/macmainwindow.mm
@@ -39,8 +39,6 @@
 
 #include <Carbon/Carbon.h>
 
-#ifdef QT_MAC_USE_COCOA
-
 //![0]
 SearchWidget::SearchWidget(QWidget *parent)
     : QMacCocoaViewContainer(0, parent)
@@ -76,57 +74,6 @@ QSize SearchWidget::sizeHint() const
     return QSize(150, 40);
 }
 
-#else
-
-// The SearchWidget class wraps a native HISearchField.
-SearchWidget::SearchWidget(QWidget *parent)
-    :QWidget(parent)
-{
-
-    // Create a native search field and pass its window id to QWidget::create.
-    searchFieldText = CFStringCreateWithCString(0, "search", 0);
-    HISearchFieldCreate(NULL/*bounds*/, kHISearchFieldAttributesSearchIcon | kHISearchFieldAttributesCancel,
-                        NULL/*menu ref*/, searchFieldText, &searchField);
-    create(reinterpret_cast<WId>(searchField));
-
-    // Use a Qt menu for the search field menu.
-    QMenu *searchMenu = createMenu(this);
-    MenuRef menuRef = searchMenu->macMenu(0);
-    HISearchFieldSetSearchMenu(searchField, menuRef);
-    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-}
-
-SearchWidget::~SearchWidget()
-{
-    CFRelease(searchField);
-    CFRelease(searchFieldText);
-}
-
-// Get the size hint from the search field.
-QSize SearchWidget::sizeHint() const
-{
-    EventRef event;
-    HIRect optimalBounds;
-    CreateEvent(0, kEventClassControl,
-        kEventControlGetOptimalBounds,
-        GetCurrentEventTime(),
-        kEventAttributeUserEvent, &event);
-
-    SendEventToEventTargetWithOptions(event,
-        HIObjectGetEventTarget(HIObjectRef(winId())),
-        kEventTargetDontPropagate);
-
-    GetEventParameter(event,
-        kEventParamControlOptimalBounds, typeHIRect,
-        0, sizeof(HIRect), 0, &optimalBounds);
-
-    ReleaseEvent(event);
-    return QSize(optimalBounds.size.width + 100, // make it a bit wider.
-                 optimalBounds.size.height);
-}
-
-#endif
-
 QMenu *createMenu(QWidget *parent)
 {
     QMenu *searchMenu = new QMenu(parent);
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index ddbb4e6d75..8a5250aad4 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -261,9 +261,7 @@ private slots:
 #endif
     void raise();
     void lower();
-#ifndef QT_MAC_USE_COCOA
     void stackUnder();
-#endif
     void testContentsPropagation();
     void saveRestoreGeometry();
     void restoreVersion1Geometry_data();
@@ -320,9 +318,7 @@ private slots:
     void moveChild();
     void showAndMoveChild();
 
-#ifndef QT_MAC_USE_COCOA
     void subtractOpaqueSiblings();
-#endif
 
 #if defined (Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
     void setGeometry_win();