Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

3 files changed, 412 insertions, 0 deletions

diff --git a/tests/auto/qwidgetaction/.gitignore b/tests/auto/qwidgetaction/.gitignore
new file mode 100644
index 0000000000..56d519d851
--- /dev/null
+++ b/tests/auto/qwidgetaction/.gitignore
@@ -0,0 +1 @@
+tst_qwidgetaction
diff --git a/tests/auto/qwidgetaction/qwidgetaction.pro b/tests/auto/qwidgetaction/qwidgetaction.pro
new file mode 100644
index 0000000000..cc80e58fe3
--- /dev/null
+++ b/tests/auto/qwidgetaction/qwidgetaction.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES += tst_qwidgetaction.cpp 
+
+
diff --git a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
new file mode 100644
index 0000000000..17ce583776
--- /dev/null
+++ b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
@@ -0,0 +1,407 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include <qapplication.h>
+#include <qtoolbar.h>
+#include <qcombobox.h>
+#include <qwidgetaction.h>
+#include <qlabel.h>
+#include <qmenu.h>
+#include <qmainwindow.h>
+#include <qmenubar.h>
+
+#include "../../shared/util.h"
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+class tst_QWidgetAction : public QObject
+{
+    Q_OBJECT
+private slots:
+    void defaultWidget();
+    void visibilityUpdate();
+    void customWidget();
+    void keepOwnership();
+    void visibility();
+    void setEnabled();
+    void popup();
+    void releaseWidgetCrash();
+};
+
+void tst_QWidgetAction::defaultWidget()
+{
+    {
+        QToolBar tb1;
+
+        QPointer<QComboBox> combo = new QComboBox(&tb1);
+
+        QWidgetAction *action = new QWidgetAction(0);
+        action->setDefaultWidget(combo);
+
+        QVERIFY(!combo->isVisible());
+        QVERIFY(!combo->parent());
+        QVERIFY(action->isVisible());
+
+        delete action;
+        QVERIFY(!combo);
+    }
+    {
+        QToolBar tb1;
+
+        QPointer<QComboBox> combo = new QComboBox(&tb1);
+        combo->hide();
+
+        QWidgetAction *action = new QWidgetAction(0);
+        action->setDefaultWidget(combo);
+
+        // explicitly hidden widgets should also set the action invisible
+        QVERIFY(!action->isVisible());
+
+        delete action;
+    }
+    {
+        QPointer<QComboBox> combo = new QComboBox(0);
+        combo->show();
+
+        QWidgetAction *action = new QWidgetAction(0);
+        action->setDefaultWidget(combo);
+
+        QVERIFY(action->isVisible());
+        QVERIFY(!combo->isVisible());
+
+        delete action;
+    }
+    {
+        QToolBar tb1;
+        tb1.show();
+        QToolBar tb2;
+        tb2.show();
+
+        QPointer<QComboBox> combo = new QComboBox(0);
+
+        QWidgetAction *action = new QWidgetAction(0);
+        action->setDefaultWidget(combo);
+
+        tb1.addAction(action);
+        QVERIFY(combo->parent() == &tb1);
+        qApp->processEvents();
+        qApp->processEvents();
+        QVERIFY(combo->isVisible());
+
+        // not supported, not supposed to work, hence the parent() check
+        tb2.addAction(action);
+        QVERIFY(combo->parent() == &tb1);
+
+        tb2.removeAction(action);
+        tb1.removeAction(action);
+
+        qApp->processEvents(); //the call to hide is delayd by the toolbar layout
+        QVERIFY(!combo->isVisible());
+
+        tb2.addAction(action);
+        qApp->processEvents(); //the call to hide is delayd by the toolbar layout
+        qApp->processEvents();
+        QVERIFY(combo->parent() == &tb2);
+        QVERIFY(combo->isVisible());
+
+        tb1.addAction(action);
+        QVERIFY(combo->parent() == &tb2);
+
+        delete action;
+        QVERIFY(!combo);
+    }
+    {
+        QWidgetAction *a = new QWidgetAction(0);
+        QVERIFY(!a->defaultWidget());
+
+        QPointer<QComboBox> combo1 = new QComboBox;
+        a->setDefaultWidget(combo1);
+        QVERIFY(a->defaultWidget() == combo1);
+        a->setDefaultWidget(combo1);
+        QVERIFY(combo1);
+        QVERIFY(a->defaultWidget() == combo1);
+
+        QPointer<QComboBox> combo2 = new QComboBox;
+        QVERIFY(combo1 != combo2);
+
+        a->setDefaultWidget(combo2);
+        QVERIFY(!combo1);
+        QVERIFY(a->defaultWidget() == combo2);
+
+        delete a;
+        QVERIFY(!combo2);
+    }
+}
+
+void tst_QWidgetAction::visibilityUpdate()
+{
+    // actually keeping the widget's state in sync with the
+    // action in terms of visibility is QToolBar's responsibility.
+    QToolBar tb;
+    tb.show();
+
+    QComboBox *combo = new QComboBox(0);
+    QWidgetAction *action = new QWidgetAction(0);
+    action->setDefaultWidget(combo);
+
+    tb.addAction(action);
+    //the call to show is delayed by the toolbar layout
+    QTRY_VERIFY(combo->isVisible());
+    QVERIFY(action->isVisible());
+
+    action->setVisible(false);
+    //the call to hide is delayed by the toolbar layout
+    QTRY_VERIFY(!combo->isVisible());
+
+    delete action;
+    // action also deletes combo
+}
+
+class ComboAction : public QWidgetAction
+{
+public:
+    inline ComboAction(QObject *parent) : QWidgetAction(parent) {}
+
+    QList<QWidget *> createdWidgets() const { return QWidgetAction::createdWidgets(); }
+
+protected:
+    virtual QWidget *createWidget(QWidget *parent);
+};
+
+QWidget *ComboAction::createWidget(QWidget *parent)
+{
+    return new QComboBox(parent);
+}
+
+void tst_QWidgetAction::customWidget()
+{
+    QToolBar tb1;
+    tb1.show();
+    QToolBar tb2;
+    tb2.show();
+
+    ComboAction *action = new ComboAction(0);
+
+    tb1.addAction(action);
+
+    QList<QWidget *> combos = action->createdWidgets();
+    QCOMPARE(combos.count(), 1);
+
+    QPointer<QComboBox> combo1 = qobject_cast<QComboBox *>(combos.at(0));
+    QVERIFY(combo1);
+
+    tb2.addAction(action);
+
+    combos = action->createdWidgets();
+    QCOMPARE(combos.count(), 2);
+
+    QVERIFY(combos.at(0) == combo1);
+    QPointer<QComboBox> combo2 = qobject_cast<QComboBox *>(combos.at(1));
+    QVERIFY(combo2);
+
+    tb2.removeAction(action);
+    QVERIFY(combo2);
+    // widget is deleted using deleteLater(), so process that posted event
+    QCoreApplication::sendPostedEvents(combo2, QEvent::DeferredDelete);
+    QVERIFY(!combo2);
+
+    delete action;
+    QVERIFY(!combo1);
+    QVERIFY(!combo2);
+}
+
+void tst_QWidgetAction::keepOwnership()
+{
+    QPointer<QComboBox> combo = new QComboBox;
+    QWidgetAction *action = new QWidgetAction(0);
+    action->setDefaultWidget(combo);
+
+    {
+        QToolBar *tb = new QToolBar;
+        tb->addAction(action);
+        QVERIFY(combo->parent() == tb);
+        delete tb;
+    }
+
+    QVERIFY(combo);
+    delete action;
+    QVERIFY(!combo);
+}
+
+void tst_QWidgetAction::visibility()
+{
+    {
+        QWidgetAction *a = new QWidgetAction(0);
+        QComboBox *combo = new QComboBox;
+        a->setDefaultWidget(combo);
+
+        QToolBar *tb = new QToolBar;
+        tb->addAction(a);
+        QVERIFY(!combo->isVisible());
+        tb->show();
+        QVERIFY(combo->isVisible());
+
+        delete tb;
+
+        delete a;
+    }
+    {
+        QWidgetAction *a = new QWidgetAction(0);
+        QComboBox *combo = new QComboBox;
+        a->setDefaultWidget(combo);
+
+        QToolBar *tb = new QToolBar;
+        tb->addAction(a);
+        QVERIFY(!combo->isVisible());
+
+        QToolBar *tb2 = new QToolBar;
+        tb->removeAction(a);
+        tb2->addAction(a);
+        QVERIFY(!combo->isVisible());
+        tb2->show();
+        QVERIFY(combo->isVisible());
+
+        delete tb;
+        delete tb2;
+
+        delete a;
+    }
+}
+
+void tst_QWidgetAction::setEnabled()
+{
+    QToolBar toolbar;
+    QComboBox *combobox = new QComboBox;
+    QAction *action = toolbar.addWidget(combobox);
+    toolbar.show();
+
+    QVERIFY(action->isEnabled());
+    QVERIFY(combobox->isEnabled());
+
+    action->setEnabled(false);
+    QVERIFY(!action->isEnabled());
+    QVERIFY(!combobox->isEnabled());
+
+    action->setEnabled(true);
+    QVERIFY(action->isEnabled());
+    QVERIFY(combobox->isEnabled());
+
+    combobox->setEnabled(false);
+    QVERIFY(!combobox->isEnabled());
+
+    combobox->setEnabled(true);
+    QVERIFY(action->isEnabled());
+    QVERIFY(combobox->isEnabled());
+
+
+    QWidgetAction aw(0);
+    aw.setEnabled(false);
+    QVERIFY(!aw.isEnabled());
+
+    combobox = new QComboBox;
+    aw.setDefaultWidget(combobox);
+    QVERIFY(!aw.isEnabled());
+    QVERIFY(!combobox->isEnabled());
+
+    // Make sure we don't change the default widget's Qt::WA_ForceDisabled attribute
+    // during a normal disable/enable operation (task 207433).
+    {
+        QToolBar toolBar;
+        QWidget widget;
+        toolBar.addWidget(&widget); // creates a QWidgetAction and sets 'widget' as the default widget.
+        QVERIFY(!widget.testAttribute(Qt::WA_ForceDisabled));
+
+        toolBar.setEnabled(false);
+        QVERIFY(toolBar.testAttribute(Qt::WA_ForceDisabled));
+        QVERIFY(!widget.isEnabled());
+        QVERIFY(!widget.testAttribute(Qt::WA_ForceDisabled));
+
+        toolBar.setEnabled(true);
+        QVERIFY(widget.isEnabled());
+        QVERIFY(!widget.testAttribute(Qt::WA_ForceDisabled));
+    }
+}
+
+void tst_QWidgetAction::popup()
+{
+    QPointer<QLabel> l = new QLabel("test");
+    QWidgetAction action(0);
+    action.setDefaultWidget(l);
+
+    {
+        QMenu menu;
+        menu.addAction(&action);
+        QTimer::singleShot(0, &menu, SLOT(close()));
+        menu.exec();
+    }
+
+    QVERIFY(!l.isNull());
+    delete l;
+}
+
+class CrashedAction : public QWidgetAction
+{
+public:
+    inline CrashedAction(QObject *parent) : QWidgetAction(parent) { }
+
+    virtual QWidget *createWidget(QWidget *parent) {
+        return new QWidget(parent);
+    }
+};
+
+void tst_QWidgetAction::releaseWidgetCrash()
+{
+    // this should not crash!
+    QMainWindow *w = new QMainWindow;
+    QAction *a = new CrashedAction(w);
+    QMenu *menu = w->menuBar()->addMenu("Test");
+    menu->addAction("foo");
+    menu->addAction(a);
+    menu->addAction("bar");
+    delete w;
+}
+
+QTEST_MAIN(tst_QWidgetAction)
+#include "tst_qwidgetaction.moc"