Ignore:
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:
4 deleted
3 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk

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

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

  • trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp

    r561 r846  
    2020
    2121#include <QtTest/QtTest>
    22 
    2322#include <qwebpage.h>
    2423#include <qwidget.h>
    … …  
    2625#include <qwebframe.h>
    2726#include <qwebelement.h>
     27
    2828//TESTED_CLASS=
    2929//TESTED_FILES=
    30 
    31 /**
    32  * Starts an event loop that runs until the given signal is received.
    33  Optionally the event loop
    34  * can return earlier on a timeout.
    35  *
    36  * \return \p true if the requested signal was received
    37  *         \p false on timeout
    38  */
    39 static bool waitForSignal(QObject* obj, const char* signal, int timeout = 0)
    40 {
    41     QEventLoop loop;
    42     QObject::connect(obj, signal, &loop, SLOT(quit()));
    43     QTimer timer;
    44     QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
    45     if (timeout > 0) {
    46         QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
    47         timer.setSingleShot(true);
    48         timer.start(timeout);
    49     }
    50     loop.exec();
    51     return timeoutSpy.isEmpty();
    52 }
    5330
    5431class tst_QWebElement : public QObject
    … …  
    577554
    578555    // in few seconds, the CSS should be completey loaded
    579     QSignalSpy spy(m_page, SIGNAL(loadFinished(bool)));
    580556    m_mainFrame->setHtml(html6);
    581     QTest::qWait(200);
     557    200);
    582558
    583559    p = m_mainFrame->documentElement().findAll("p").at(0);
    … …  
    597573    // in few seconds, the style should be completey loaded
    598574    m_mainFrame->setHtml(html7);
    599     QTest::qWait(200);
     575    200);
    600576
    601577    p = m_mainFrame->documentElement().findAll("p").at(0);
Note: See TracChangeset for help on using the changeset viewer.