Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch

7 files changed, 210 insertions, 43 deletions

diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp
index 1b73f06..1ec21f2 100644
--- a/tests/auto/qaction/tst_qaction.cpp
+++ b/tests/auto/qaction/tst_qaction.cpp
@@ -46,7 +46,6 @@
 #include <qevent.h>
 #include <qaction.h>
 #include <qmenu.h>
-#include <qlineedit.h>
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -75,7 +74,6 @@ private slots:
     void setStandardKeys();
     void alternateShortcuts();
     void enabledVisibleInteraction();
-    void invisibleActionWithComplexShortcut();
     void task200823_tooltip();
     void task229128TriggeredSignalWithoutActiongroup();
     void task229128TriggeredSignalWhenInActiongroup();
@@ -367,36 +365,5 @@ void tst_QAction::task229128TriggeredSignalWhenInActiongroup()
     QCOMPARE(actionSpy.count(), 1);
 }
 
-void tst_QAction::invisibleActionWithComplexShortcut()
-{
-    QAction action(0);
-    action.setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E, Qt::Key_1));
-
-    QLineEdit edit;
-    edit.addAction(&action);
-    edit.show();
-    QTest::qWait(100);
-
-    QSignalSpy spy(&action, SIGNAL(triggered()));
-
-    action.setVisible(true);
-    QTest::keyPress(&edit, Qt::Key_E, Qt::ControlModifier);
-    QTest::keyRelease(&edit, Qt::Key_E, Qt::ControlModifier);
-    QTest::keyPress(&edit, Qt::Key_1, Qt::NoModifier);
-    QTest::keyRelease(&edit, Qt::Key_1, Qt::NoModifier);
-    QCOMPARE(spy.count(), 1);
-    QCOMPARE(edit.text(), QLatin1String(""));
-
-    edit.clear();
-    spy.clear();
-    action.setVisible(false);
-    QTest::keyPress(&edit, Qt::Key_E, Qt::ControlModifier);
-    QTest::keyRelease(&edit, Qt::Key_E, Qt::ControlModifier);
-    QTest::keyPress(&edit, Qt::Key_1, Qt::NoModifier);
-    QTest::keyRelease(&edit, Qt::Key_1, Qt::NoModifier);
-    QCOMPARE(spy.count(), 0);
-    QCOMPARE(edit.text(), QLatin1String("1"));
-}
-
 QTEST_MAIN(tst_QAction)
 #include "tst_qaction.moc"
diff --git a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro
new file mode 100644
index 0000000..1618c3e
--- /dev/null
+++ b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES  += tst_qbytearraymatcher.cpp
+
+QT = core
diff --git a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp
new file mode 100644
index 0000000..c3f2fd9
--- /dev/null
+++ b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include <qbytearraymatcher.h>
+
+class tst_QByteArrayMatcher : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void interface();
+    void task251958();
+};
+
+static QByteArrayMatcher matcher1;
+
+void tst_QByteArrayMatcher::interface()
+{
+    const char needle[] = "abc123";
+    QByteArray haystack(500, 'a');
+    haystack.insert(6, "123");
+    haystack.insert(31, "abc");
+    haystack.insert(42, "abc123");
+    haystack.insert(84, "abc123");
+
+    matcher1 = QByteArrayMatcher(QByteArray(needle));
+    QByteArrayMatcher matcher2;
+    matcher2.setPattern(QByteArray(needle));
+
+    QByteArrayMatcher matcher3 = QByteArrayMatcher(QByteArray(needle));
+    QByteArrayMatcher matcher4(needle, sizeof(needle - 1));
+    QByteArrayMatcher matcher5(matcher2);
+    QByteArrayMatcher matcher6;
+    matcher6 = matcher3;
+
+    QCOMPARE(matcher1.indexIn(haystack), 42);
+    QCOMPARE(matcher2.indexIn(haystack), 42);
+    QCOMPARE(matcher3.indexIn(haystack), 42);
+    QCOMPARE(matcher4.indexIn(haystack), 42);
+    QCOMPARE(matcher5.indexIn(haystack), 42);
+    QCOMPARE(matcher6.indexIn(haystack), 42);
+
+    QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length()), 42);
+
+    QCOMPARE(matcher1.indexIn(haystack, 43), 84);
+    QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length(), 43), 84);
+    QCOMPARE(matcher1.indexIn(haystack, 85), -1);
+    QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length(), 85), -1);
+
+    QByteArrayMatcher matcher7(QByteArray("123"));
+    QCOMPARE(matcher7.indexIn(haystack), 6);
+
+    matcher7 = QByteArrayMatcher(QByteArray("abc"));
+    QCOMPARE(matcher7.indexIn(haystack), 31);
+
+    matcher7.setPattern(matcher4.pattern());
+    QCOMPARE(matcher7.indexIn(haystack), 42);
+}
+
+
+static QByteArrayMatcher matcher;
+
+void tst_QByteArrayMatcher::task251958()
+{
+    const char p_data[] = { 0x0, 0x0, 0x1 };
+    QByteArray pattern(p_data, sizeof(p_data));
+
+    QByteArray haystack(8, '\0');
+    haystack[7] = 0x1;
+
+    matcher = QByteArrayMatcher(pattern);
+    QCOMPARE(matcher.indexIn(haystack, 0), 5);
+    QCOMPARE(matcher.indexIn(haystack, 1), 5);
+    QCOMPARE(matcher.indexIn(haystack, 2), 5);
+
+    matcher.setPattern(pattern);
+    QCOMPARE(matcher.indexIn(haystack, 0), 5);
+    QCOMPARE(matcher.indexIn(haystack, 1), 5);
+    QCOMPARE(matcher.indexIn(haystack, 2), 5);
+}
+
+QTEST_APPLESS_MAIN(tst_QByteArrayMatcher)
+#include "tst_qbytearraymatcher.moc"
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 57e441b..88c64d3 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -172,6 +172,7 @@ private slots:
     void boundingRects2();
     void sceneBoundingRect();
     void childrenBoundingRect();
+    void childrenBoundingRectTransformed();
     void group();
     void setGroup();
     void nestedGroups();
@@ -2917,9 +2918,57 @@ void tst_QGraphicsItem::childrenBoundingRect()
     childChild->setParentItem(child);
     childChild->setPos(500, 500);
     child->rotate(90);
+
+
+    scene.addPolygon(parent->mapToScene(parent->boundingRect() | parent->childrenBoundingRect()))->setPen(QPen(Qt::red));;
+
+    QGraphicsView view(&scene);
+    view.show();
+
+    QTest::qWait(5000);
+
     QCOMPARE(parent->childrenBoundingRect(), QRectF(-500, -100, 600, 800));
 }
 
+void tst_QGraphicsItem::childrenBoundingRectTransformed()
+{
+    QGraphicsScene scene;
+
+    QGraphicsRectItem *rect = scene.addRect(QRectF(0, 0, 100, 100));
+    QGraphicsRectItem *rect2 = scene.addRect(QRectF(0, 0, 100, 100));
+    QGraphicsRectItem *rect3 = scene.addRect(QRectF(0, 0, 100, 100));
+    QGraphicsRectItem *rect4 = scene.addRect(QRectF(0, 0, 100, 100));
+    QGraphicsRectItem *rect5 = scene.addRect(QRectF(0, 0, 100, 100));
+    rect2->setParentItem(rect);
+    rect3->setParentItem(rect2);
+    rect4->setParentItem(rect3);
+    rect5->setParentItem(rect4);
+
+    rect2->setTransform(QTransform().translate(50, 50).rotate(45));
+    rect2->setPos(25, 25);
+    rect3->setTransform(QTransform().translate(50, 50).rotate(45));
+    rect3->setPos(25, 25);
+    rect4->setTransform(QTransform().translate(50, 50).rotate(45));
+    rect4->setPos(25, 25);
+    rect5->setTransform(QTransform().translate(50, 50).rotate(45));
+    rect5->setPos(25, 25);
+
+    QRectF subTreeRect = rect->childrenBoundingRect();
+    QCOMPARE(subTreeRect.left(), qreal(-206.0660171779821));
+    QCOMPARE(subTreeRect.top(), qreal(75.0));
+    QCOMPARE(subTreeRect.width(), qreal(351.7766952966369));
+    QCOMPARE(subTreeRect.height(), qreal(251.7766952966369));
+
+    rect->rotate(45);
+    rect2->rotate(-45);
+    rect3->rotate(45);
+    rect4->rotate(-45);
+    rect5->rotate(45);
+
+    subTreeRect = rect->childrenBoundingRect();
+    QCOMPARE(rect->childrenBoundingRect(), QRectF(-100, 75, 275, 250));
+}
+
 void tst_QGraphicsItem::group()
 {
     QGraphicsScene scene;
diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/qlocalsocket/test/test.pro
index 8ce7c50..7befdf9 100644
--- a/tests/auto/qlocalsocket/test/test.pro
+++ b/tests/auto/qlocalsocket/test/test.pro
@@ -1,7 +1,5 @@
 load(qttest_p4)
 
-include(../src/src.pri)
-
 DEFINES += QLOCALSERVER_DEBUG
 DEFINES += QLOCALSOCKET_DEBUG
 !wince*: {
@@ -14,14 +12,16 @@ DEFINES += QLOCALSOCKET_DEBUG
 QT = core network
 
 SOURCES += ../tst_qlocalsocket.cpp
-TARGET = ../tst_qlocalsocket
 
-win32 {
+TARGET = tst_qlocalsocket
+CONFIG(debug_and_release) {
   CONFIG(debug, debug|release) {
-    TARGET = ../../debug/tst_qlocalsocket
-} else {
-    TARGET = ../../release/tst_qlocalsocket
+    DESTDIR = ../debug
+  } else {
+    DESTDIR = ../release
   }
+} else {
+  DESTDIR = ..
 }
 
 wince* {
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index f741b96..deabda6 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -95,6 +95,7 @@ private slots:
 
     void longPath();
     void waitForDisconnect();
+    void waitForDisconnectByServer();
 
     void removeServer();
 
@@ -112,6 +113,8 @@ tst_QLocalSocket::tst_QLocalSocket()
 #endif
                 ))
         qWarning() << "lackey executable doesn't exists!";
+
+    QLocalServer::removeServer("tst_localsocket");
 }
 
 tst_QLocalSocket::~tst_QLocalSocket()
@@ -783,6 +786,25 @@ void tst_QLocalSocket::waitForDisconnect()
     QVERIFY(timer.elapsed() < 2000);
 }
 
+void tst_QLocalSocket::waitForDisconnectByServer()
+{
+    QString name = "tst_localsocket";
+    LocalServer server;
+    QVERIFY(server.listen(name));
+    LocalSocket socket;
+    QSignalSpy spy(&socket, SIGNAL(disconnected()));
+    QVERIFY(spy.isValid());
+    socket.connectToServer(name);
+    QVERIFY(socket.waitForConnected(3000));
+    QVERIFY(server.waitForNewConnection(3000));
+    QLocalSocket *serverSocket = server.nextPendingConnection();
+    QVERIFY(serverSocket);
+    serverSocket->close();
+    QVERIFY(serverSocket->state() == QLocalSocket::UnconnectedState);
+    QVERIFY(socket.waitForDisconnected(3000));
+    QCOMPARE(spy.count(), 1);
+}
+
 void tst_QLocalSocket::removeServer()
 {
     // this is a hostile takeover, but recovering from a crash results in the same
diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/qshortcut/tst_qshortcut.cpp
index cd80204..69ebf74 100644
--- a/tests/auto/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/qshortcut/tst_qshortcut.cpp
@@ -987,16 +987,17 @@ void tst_QShortcut::keypressConsumption()
     cut1->setEnabled(false);
     cut2->setEnabled(false);
 
-    edit->clear();
+    // Make sure keypresses is passed on, since all multiple keysequences
+    // with Ctrl+I are disabled
     sendKeyEvents(edit, Qt::CTRL + Qt::Key_I, 0);   // Send key to edit
     QCOMPARE( currentResult, NoResult );
     QCOMPARE( ambigResult, NoResult );
-    QVERIFY(edit->toPlainText().isEmpty());
+    QVERIFY(edit->toPlainText().endsWith("<Ctrl+I>"));
 
     sendKeyEvents(edit, Qt::Key_A, 'a');         // Send key to edit
     QCOMPARE( currentResult, NoResult );
     QCOMPARE( ambigResult, NoResult );
-    QVERIFY(edit->toPlainText().isEmpty());
+    QVERIFY(edit->toPlainText().endsWith("<Ctrl+I>a"));
 
     clearAllShortcuts();
 }