Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
3 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro

    r561 r846  
    1 TEMPLATE = app
    2 TARGET = tst_qgraphicswebview
    3 include(../../../../WebKit.pri)
    4 SOURCES  += tst_qgraphicswebview.cpp
    5 QT += testlib network
    6 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
    7 
    8 symbian {
    9     TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
    10 }
     1isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
     2include(../tests.pri)
     3exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

  • trunk/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp

    r561 r846  
    1818*/
    1919
     20
    2021#include <QtTest/QtTest>
    21 
     22#include <QGraphicsSceneMouseEvent>
    2223#include <QGraphicsView>
    2324#include <qgraphicswebview.h>
    … …  
    2526#include <qwebframe.h>
    2627
    27 /**
    28  * Starts an event loop that runs until the given signal is received.
    29  * Optionally the event loop
    30  * can return earlier on a timeout.
    31  *
    32  * \return \p true if the requested signal was received
    33  *         \p false on timeout
    34  */
    35 static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000)
    36 {
    37     QEventLoop loop;
    38     QObject::connect(obj, signal, &loop, SLOT(quit()));
    39     QTimer timer;
    40     QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
    41     if (timeout > 0) {
    42         QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
    43         timer.setSingleShot(true);
    44         timer.start(timeout);
    45     }
    46     loop.exec();
    47     return timeoutSpy.isEmpty();
    48 }
    49 
    5028class tst_QGraphicsWebView : public QObject
    5129{
    … …  
    5533    void qgraphicswebview();
    5634    void crashOnViewlessWebPages();
     35
     36
     37
    5738};
    5839
    … …  
    9879};
    9980
     81
     82
     83
     84
     85
     86
     87
     88
     89
     90
     91
     92
     93
     94
     95
     96
     97
     98
     99
     100
     101
     102
     103
    100104void tst_QGraphicsWebView::crashOnViewlessWebPages()
    101105{
    …