From c26418bb8d0889beb6d4ec36a40fbf0c7ca69c97 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 28 Nov 2011 12:26:33 +0100 Subject: Declarative: Unify output of warning messages in debug server Use the stream operator instead of toAscii().constData(), or qPrintable. Also use QString::fromLatin1() instead of QString::fromAscii(). Task-number: QTBUG-22860 Change-Id: Iabe37778f0fd50ca450f0504939441c633d6354e --- .../debugger/qdeclarativedebugserver.cpp | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index 05f63c7..6cb5b9f 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -179,11 +179,10 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() // format: qmljsdebugger=port:3768[,block] OR qmljsdebugger=ost[,block] if (!appD->qmljsDebugArgumentsString().isEmpty()) { if (!QDeclarativeEnginePrivate::qml_debugging_enabled) { - const QString message = - QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " - "Debugging has not been enabled.").arg( + qWarning() << QString::fromLatin1( + "QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " + "Debugging has not been enabled.").arg( appD->qmljsDebugArgumentsString()); - qWarning("%s", qPrintable(message)); return 0; } @@ -211,21 +210,25 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() connection->setServer(server); connection->setPort(port, block); } else { - qWarning() << QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " - "Remote debugger plugin has not been found.").arg(appD->qmljsDebugArgumentsString()); + qWarning() << QString::fromLatin1( + "QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " + "Remote debugger plugin has not been found.").arg( + appD->qmljsDebugArgumentsString()); } } else { - qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " - "Format is -qmljsdebugger=port:[,block]").arg( - appD->qmljsDebugArgumentsString()).toAscii().constData()); + qWarning() << QString::fromLatin1( + "QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " + "Format is -qmljsdebugger=port:[,block]").arg( + appD->qmljsDebugArgumentsString()); } } #else if (!appD->qmljsDebugArgumentsString().isEmpty()) { - qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " - "QtDeclarative is not configured for debugging.").arg( - appD->qmljsDebugArgumentsString()).toAscii().constData()); + qWarning() << QString::fromLatin1( + "QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " + "QtDeclarative is not configured for debugging.").arg( + appD->qmljsDebugArgumentsString()); } #endif } -- cgit v0.12 From e2773a9fc4450dbc8cb1e0736252e7520b5e6bd1 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 28 Nov 2011 12:43:00 +0100 Subject: Declarative: Use qDebug() for debugger status updates Although "Qml debugging is enabled. Only use this in a safe environment!" is a warning, using qWarning() for it let every app crash that is run with QT_FATAL_WARNINGS. Fix that by using qDebug() for the updates that happen during 'normal' operation. Reviewed-by: Aurindam Jana Change-Id: Ie37a35ca27ec6e507f7de140484ca8cf96410be2 --- src/declarative/debugger/qdeclarativedebugserver.cpp | 2 +- src/declarative/qml/qdeclarativeengine.cpp | 2 +- src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index 6cb5b9f..f8e3f00 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -281,7 +281,7 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message) iter.value()->statusChanged(newStatus); } - qWarning("QDeclarativeDebugServer: Connection established"); + qDebug("QDeclarativeDebugServer: Connection established"); } else { QString debugServer(QLatin1String("QDeclarativeDebugServer")); diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 89a9809..63a676e 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1089,7 +1089,7 @@ QDeclarativeDebuggingEnabler::QDeclarativeDebuggingEnabler() { #ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL if (!QDeclarativeEnginePrivate::qml_debugging_enabled) { - qWarning("Qml debugging is enabled. Only use this in a safe environment!"); + qDebug("Qml debugging is enabled. Only use this in a safe environment!"); } QDeclarativeEnginePrivate::qml_debugging_enabled = true; #endif diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp index 283f7d4..36946d2 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp @@ -152,7 +152,7 @@ void QTcpServerConnection::listen() d->tcpServer = new QTcpServer(this); QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection())); if (d->tcpServer->listen(QHostAddress::Any, d->port)) { - qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port); + qDebug("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port); } else { qWarning("QDeclarativeDebugServer: Unable to listen on port %d", d->port); } -- cgit v0.12 From ca0e1b517c150dadd1c1cd400b93004c9953642a Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 29 Nov 2011 09:25:32 +0100 Subject: Adapt autotests to commit e2773a9 Reviewed-by: Aurindam Jana Change-Id: I30f996099346668f7b8067246c98b9ccc137ba57 --- tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp | 4 ++-- .../qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp | 4 ++-- .../qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index be9b402..3c6ba9b 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -294,7 +294,7 @@ void tst_QDeclarativeDebug::initTestCase() qRegisterMetaType(); qmlRegisterType("Test", 1, 0, "NonScriptPropertyElement"); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768..."); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768..."); m_engine = new QDeclarativeEngine(this); QList qml; @@ -375,7 +375,7 @@ void tst_QDeclarativeDebug::initTestCase() m_conn = new QDeclarativeDebugConnection(this); m_conn->connectToHost("127.0.0.1", 3768); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established"); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established"); bool ok = m_conn->waitForConnected(); QVERIFY(ok); QTRY_VERIFY(QDeclarativeDebugService::hasDebuggingClient()); diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp index 4846d67..eb673bf 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp +++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp @@ -69,7 +69,7 @@ private slots: void tst_QDeclarativeDebugClient::initTestCase() { - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13770..."); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 13770..."); new QDeclarativeEngine(this); m_conn = new QDeclarativeDebugConnection(this); @@ -79,7 +79,7 @@ void tst_QDeclarativeDebugClient::initTestCase() m_conn->connectToHost("127.0.0.1", 13770); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established"); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established"); bool ok = m_conn->waitForConnected(); QVERIFY(ok); diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 85d459b..62fb5ad 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -73,13 +73,13 @@ private slots: void tst_QDeclarativeDebugService::initTestCase() { - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13769..."); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 13769..."); new QDeclarativeEngine(this); m_conn = new QDeclarativeDebugConnection(this); m_conn->connectToHost("127.0.0.1", 13769); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established"); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established"); bool ok = m_conn->waitForConnected(); QVERIFY(ok); -- cgit v0.12 From b070ad6a9804b6a7387f848c2e1721c16b8ccc62 Mon Sep 17 00:00:00 2001 From: Sami Rosendahl Date: Wed, 7 Dec 2011 13:57:18 +0100 Subject: Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny Several crash backtraces point to crash in QHttpNetworkReply::readAny, where d->connection==0. This patch adds a check for d->connection to QNetworkAccessHttpBackend. If the connection is found to be destroyed, the request is finished. Does not need to be merged to 4.8 because the internals have changed (Peter Hartmann) PMO 290352 Merge-request: 1491 Reviewed-by: Peter Hartmann --- src/network/access/qnetworkaccesshttpbackend.cpp | 6 ++++ tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index aa477fb..42dc33d 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -721,6 +721,12 @@ void QNetworkAccessHttpBackend::readFromHttp() if (!httpReply) return; + if (!http) { + // Connection has been destroyed + finished(); + return; + } + // We read possibly more than nextDownstreamBlockSize(), but // this is not a critical thing since it is already in the // memory anyway diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 28832b2..d4e388d 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -317,6 +317,8 @@ private Q_SLOTS: void getAndThenDeleteObject_data(); void getAndThenDeleteObject(); + void deleteManagerWhileGetIsInProgress(); + void symbianOpenCDataUrlCrash(); void qtbug12908compressedHttpReply(); @@ -5109,6 +5111,48 @@ void tst_QNetworkReply::getAndThenDeleteObject() } } +void tst_QNetworkReply::deleteManagerWhileGetIsInProgress() +{ + // yes, this will leak if the testcase fails. I don't care. It must not fail then :P + QNetworkAccessManager *manager = new QNetworkAccessManager(); + QNetworkRequest request("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile"); + QNetworkReply *reply = manager->get(request); + reply->setReadBufferSize(1024); + + // Reset reply's parent to allow it to outlive the manager + reply->setParent(0); + + // Wait until a buffer is received + int totalWait = 0; + while (!reply->bytesAvailable()) { + QTest::qWait(20); + totalWait += 20; + QVERIFY( totalWait <= 5*1000); + } + + QVERIFY(reply->bytesAvailable()); + QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200); + QVERIFY(!reply->isFinished()); // must not be finished + + // Read the data to request next buffer's worth from the server + (void)reply->readAll(); + + QSignalSpy replyFinishedSpy(reply, SIGNAL(finished())); + + // Delete the manager + delete manager; + manager = 0; + + // Wait to allow reply to process any pending events + QTest::qWait(100); + + // The reply should be finished + QVERIFY(reply->isFinished()); + QCOMPARE(replyFinishedSpy.count(), 1); + + delete reply; +} + // see https://bugs.webkit.org/show_bug.cgi?id=38935 void tst_QNetworkReply::symbianOpenCDataUrlCrash() { -- cgit v0.12 From 870c4e7b9ce6143ae48f717265094d4f7e0d2434 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Fri, 16 Dec 2011 14:21:49 +0100 Subject: Fix crash in positionInLigature Check boundary of pos before accessing attributes. Task-number: QTBUG-23104 Reviewed-by: Eskil --- src/gui/text/qtextengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index ee2eef6..66773c6 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2805,7 +2805,7 @@ int QTextEngine::positionInLigature(const QScriptItem *si, int end, closestItem--; int pos = si->position + clusterStart + closestItem; // Jump to the next charStop - while (!attrs[pos].charStop && pos < end) + while (pos < end && !attrs[pos].charStop) pos++; return pos; } -- cgit v0.12 From 1f6c979713257f9668a322f2e120652f09d3ee16 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 21 Dec 2011 11:05:19 +0200 Subject: Symbian: Fix qscriptextensionplugin autotest - Linking of static library needed to be explicitly stated in Symbian. - Plugin deployment was added. - Had to rename the simpleplugin in Symbian builds as the name was too generic and was causing conflict in /sys/bin. Task-number: ou1cimx1#956851 Reviewed-by: mread --- tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro | 1 + tests/auto/qscriptextensionplugin/test/test.pro | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro index e184ca4..e1701e3 100644 --- a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro +++ b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro @@ -7,4 +7,5 @@ DESTDIR = ../plugins/script symbian { TARGET.EPOCALLOWDLLDATA=1 + TARGET = qscriptextension_simpleplugin # Too generic target causes conflict on Symbian } diff --git a/tests/auto/qscriptextensionplugin/test/test.pro b/tests/auto/qscriptextensionplugin/test/test.pro index 549bac2..223dafa 100644 --- a/tests/auto/qscriptextensionplugin/test/test.pro +++ b/tests/auto/qscriptextensionplugin/test/test.pro @@ -3,7 +3,14 @@ load(qttest_p4) QT = core script SOURCES = ../tst_qscriptextensionplugin.cpp CONFIG -= app_bundle -LIBS += -L../plugins/script -lstaticplugin +symbian { + LIBS += -lstaticplugin.lib + simplePlugin.files = qscriptextension_simpleplugin.dll + simplePlugin.path = plugins/script + DEPLOYMENT += simplePlugin +} else { + LIBS += -L../plugins/script -lstaticplugin +} TARGET = tst_qscriptextensionplugin CONFIG(debug_and_release) { -- cgit v0.12 From 81aa7f44143376b4d52fb4bcd2f0ae4158eae62e Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 6 Dec 2011 21:35:11 +0100 Subject: selftests: eliminated usage of qttest_p4.prf qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: Ib6f0a59fa54d1e002a05587362f95678c3b3fc26 Reviewed-by: Jason McDonald --- tests/auto/selftests/alive/alive.pro | 2 +- tests/auto/selftests/assert/assert.pro | 4 +--- tests/auto/selftests/badxml/badxml.pro | 4 +--- tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro | 3 +-- .../auto/selftests/benchlibeventcounter/benchlibeventcounter.pro | 3 +-- tests/auto/selftests/benchliboptions/benchliboptions.pro | 3 +-- tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro | 3 +-- tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro | 3 +-- tests/auto/selftests/cmptest/cmptest.pro | 3 +-- tests/auto/selftests/commandlinedata/commandlinedata.pro | 3 +-- tests/auto/selftests/crashes/crashes.pro | 4 +--- tests/auto/selftests/datatable/datatable.pro | 3 +-- tests/auto/selftests/datetime/datetime.pro | 3 +-- tests/auto/selftests/differentexec/differentexec.pro | 3 +-- tests/auto/selftests/exceptionthrow/exceptionthrow.pro | 3 +-- tests/auto/selftests/expectfail/expectfail.pro | 3 +-- tests/auto/selftests/failinit/failinit.pro | 3 +-- tests/auto/selftests/failinitdata/failinitdata.pro | 3 +-- tests/auto/selftests/fetchbogus/fetchbogus.pro | 3 +-- tests/auto/selftests/globaldata/globaldata.pro | 3 +-- tests/auto/selftests/longstring/longstring.pro | 3 +-- tests/auto/selftests/maxwarnings/maxwarnings.pro | 3 +-- tests/auto/selftests/multiexec/multiexec.pro | 3 +-- tests/auto/selftests/printdatatags/printdatatags.pro | 3 +-- .../printdatatagswithglobaltags/printdatatagswithglobaltags.pro | 3 +-- tests/auto/selftests/qexecstringlist/qexecstringlist.pro | 3 +-- tests/auto/selftests/singleskip/singleskip.pro | 3 +-- tests/auto/selftests/skip/skip.pro | 3 +-- tests/auto/selftests/skipglobal/skipglobal.pro | 3 +-- tests/auto/selftests/skipinit/skipinit.pro | 3 +-- tests/auto/selftests/skipinitdata/skipinitdata.pro | 3 +-- tests/auto/selftests/sleep/sleep.pro | 3 +-- tests/auto/selftests/strcmp/strcmp.pro | 3 +-- tests/auto/selftests/subtest/subtest.pro | 3 +-- tests/auto/selftests/test/test.pro | 9 ++++----- tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro | 3 +-- tests/auto/selftests/warnings/warnings.pro | 3 +-- tests/auto/selftests/xunit/xunit.pro | 2 +- 38 files changed, 41 insertions(+), 80 deletions(-) diff --git a/tests/auto/selftests/alive/alive.pro b/tests/auto/selftests/alive/alive.pro index 08cf358..d3df09b 100644 --- a/tests/auto/selftests/alive/alive.pro +++ b/tests/auto/selftests/alive/alive.pro @@ -1,5 +1,5 @@ -load(qttest_p4) SOURCES += tst_alive.cpp +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/assert/assert.pro b/tests/auto/selftests/assert/assert.pro index 0e48375..e697f65 100644 --- a/tests/auto/selftests/assert/assert.pro +++ b/tests/auto/selftests/assert/assert.pro @@ -1,7 +1,5 @@ -load(qttest_p4) - SOURCES += tst_assert.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/badxml/badxml.pro b/tests/auto/selftests/badxml/badxml.pro index 323791a..ab2d847 100644 --- a/tests/auto/selftests/badxml/badxml.pro +++ b/tests/auto/selftests/badxml/badxml.pro @@ -1,7 +1,5 @@ -load(qttest_p4) - SOURCES += tst_badxml.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro b/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro index c9ec7e2..baa996c 100644 --- a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro +++ b/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_benchlibcallgrind.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro index 44b0295..d1fe909 100644 --- a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro +++ b/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_benchlibeventcounter.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/benchliboptions/benchliboptions.pro b/tests/auto/selftests/benchliboptions/benchliboptions.pro index 4dee69f..73173b0 100644 --- a/tests/auto/selftests/benchliboptions/benchliboptions.pro +++ b/tests/auto/selftests/benchliboptions/benchliboptions.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_benchliboptions.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro index 3621449..ba0502f 100644 --- a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro +++ b/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_benchlibtickcounter.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro b/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro index f4694b5..0e68987 100644 --- a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro +++ b/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_benchlibwalltime.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/cmptest/cmptest.pro b/tests/auto/selftests/cmptest/cmptest.pro index 8b2df1c..ac392b0 100644 --- a/tests/auto/selftests/cmptest/cmptest.pro +++ b/tests/auto/selftests/cmptest/cmptest.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_cmptest.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/commandlinedata/commandlinedata.pro b/tests/auto/selftests/commandlinedata/commandlinedata.pro index 96bfa5b..9dd1212 100644 --- a/tests/auto/selftests/commandlinedata/commandlinedata.pro +++ b/tests/auto/selftests/commandlinedata/commandlinedata.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_commandlinedata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/crashes/crashes.pro b/tests/auto/selftests/crashes/crashes.pro index 7eec6ea..e9f0f3e 100644 --- a/tests/auto/selftests/crashes/crashes.pro +++ b/tests/auto/selftests/crashes/crashes.pro @@ -1,7 +1,5 @@ -load(qttest_p4) - SOURCES += tst_crashes.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/datatable/datatable.pro b/tests/auto/selftests/datatable/datatable.pro index 98f04d6..7c36d4a 100644 --- a/tests/auto/selftests/datatable/datatable.pro +++ b/tests/auto/selftests/datatable/datatable.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_datatable.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/datetime/datetime.pro b/tests/auto/selftests/datetime/datetime.pro index b015661..f73a763 100644 --- a/tests/auto/selftests/datetime/datetime.pro +++ b/tests/auto/selftests/datetime/datetime.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_datetime.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/differentexec/differentexec.pro b/tests/auto/selftests/differentexec/differentexec.pro index c11b0d3..60000d1 100644 --- a/tests/auto/selftests/differentexec/differentexec.pro +++ b/tests/auto/selftests/differentexec/differentexec.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_differentexec.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/selftests/exceptionthrow/exceptionthrow.pro index 641818c..4a72181 100644 --- a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro +++ b/tests/auto/selftests/exceptionthrow/exceptionthrow.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_exceptionthrow.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/expectfail/expectfail.pro b/tests/auto/selftests/expectfail/expectfail.pro index 97a3560..a2916b2 100644 --- a/tests/auto/selftests/expectfail/expectfail.pro +++ b/tests/auto/selftests/expectfail/expectfail.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_expectfail.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/failinit/failinit.pro b/tests/auto/selftests/failinit/failinit.pro index e3d54c8..9a78184 100644 --- a/tests/auto/selftests/failinit/failinit.pro +++ b/tests/auto/selftests/failinit/failinit.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_failinit.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/failinitdata/failinitdata.pro b/tests/auto/selftests/failinitdata/failinitdata.pro index 1ff96f7..7b0b15a 100644 --- a/tests/auto/selftests/failinitdata/failinitdata.pro +++ b/tests/auto/selftests/failinitdata/failinitdata.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_failinitdata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/fetchbogus/fetchbogus.pro b/tests/auto/selftests/fetchbogus/fetchbogus.pro index 3a5d13b..1f8652d 100644 --- a/tests/auto/selftests/fetchbogus/fetchbogus.pro +++ b/tests/auto/selftests/fetchbogus/fetchbogus.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_fetchbogus.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/globaldata/globaldata.pro b/tests/auto/selftests/globaldata/globaldata.pro index 1bdcf07..3d49d35 100644 --- a/tests/auto/selftests/globaldata/globaldata.pro +++ b/tests/auto/selftests/globaldata/globaldata.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_globaldata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/longstring/longstring.pro b/tests/auto/selftests/longstring/longstring.pro index b917481..9b393e9 100644 --- a/tests/auto/selftests/longstring/longstring.pro +++ b/tests/auto/selftests/longstring/longstring.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_longstring.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.pro b/tests/auto/selftests/maxwarnings/maxwarnings.pro index 393a964..9ebdde5 100644 --- a/tests/auto/selftests/maxwarnings/maxwarnings.pro +++ b/tests/auto/selftests/maxwarnings/maxwarnings.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += maxwarnings.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/multiexec/multiexec.pro b/tests/auto/selftests/multiexec/multiexec.pro index 639b9b8..79ae010 100644 --- a/tests/auto/selftests/multiexec/multiexec.pro +++ b/tests/auto/selftests/multiexec/multiexec.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_multiexec.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/printdatatags/printdatatags.pro b/tests/auto/selftests/printdatatags/printdatatags.pro index a134422..cd06384 100644 --- a/tests/auto/selftests/printdatatags/printdatatags.pro +++ b/tests/auto/selftests/printdatatags/printdatatags.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_printdatatags.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro b/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro index 100ba1c..f1cf25d 100644 --- a/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro +++ b/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_printdatatagswithglobaltags.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/selftests/qexecstringlist/qexecstringlist.pro index 73bdaca..de8a7da 100644 --- a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro +++ b/tests/auto/selftests/qexecstringlist/qexecstringlist.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_qexecstringlist.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/singleskip/singleskip.pro b/tests/auto/selftests/singleskip/singleskip.pro index 9762c97..f4bde92 100644 --- a/tests/auto/selftests/singleskip/singleskip.pro +++ b/tests/auto/selftests/singleskip/singleskip.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_singleskip.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/skip/skip.pro b/tests/auto/selftests/skip/skip.pro index 989fdeb..8257621 100644 --- a/tests/auto/selftests/skip/skip.pro +++ b/tests/auto/selftests/skip/skip.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_skip.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/skipglobal/skipglobal.pro b/tests/auto/selftests/skipglobal/skipglobal.pro index 0205a88..43093ed 100644 --- a/tests/auto/selftests/skipglobal/skipglobal.pro +++ b/tests/auto/selftests/skipglobal/skipglobal.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_skipglobal.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/skipinit/skipinit.pro b/tests/auto/selftests/skipinit/skipinit.pro index 6912183..848252e 100644 --- a/tests/auto/selftests/skipinit/skipinit.pro +++ b/tests/auto/selftests/skipinit/skipinit.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_skipinit.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/skipinitdata/skipinitdata.pro b/tests/auto/selftests/skipinitdata/skipinitdata.pro index 206ed11..762543a 100644 --- a/tests/auto/selftests/skipinitdata/skipinitdata.pro +++ b/tests/auto/selftests/skipinitdata/skipinitdata.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_skipinitdata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/sleep/sleep.pro b/tests/auto/selftests/sleep/sleep.pro index 0bd3225..e0ae72f 100644 --- a/tests/auto/selftests/sleep/sleep.pro +++ b/tests/auto/selftests/sleep/sleep.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_sleep.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/strcmp/strcmp.pro b/tests/auto/selftests/strcmp/strcmp.pro index 3121c25..ac1f1e8 100644 --- a/tests/auto/selftests/strcmp/strcmp.pro +++ b/tests/auto/selftests/strcmp/strcmp.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_strcmp.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/subtest/subtest.pro b/tests/auto/selftests/subtest/subtest.pro index fe3cafa..3066f20 100644 --- a/tests/auto/selftests/subtest/subtest.pro +++ b/tests/auto/selftests/subtest/subtest.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_subtest.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/test/test.pro b/tests/auto/selftests/test/test.pro index d61606c..2dd634f 100644 --- a/tests/auto/selftests/test/test.pro +++ b/tests/auto/selftests/test/test.pro @@ -1,13 +1,12 @@ -load(qttest_p4) -SOURCES += ../tst_selftests.cpp -QT += core xml - +CONFIG += testcase TARGET = ../tst_selftests +QT = core xml testlib +SOURCES += ../tst_selftests.cpp win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_selftests -} else { + } else { TARGET = ../../release/tst_selftests } } diff --git a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro b/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro index cf3098d..94188a2 100644 --- a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro +++ b/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro @@ -1,5 +1,4 @@ -load(qttest_p4) -QT -= gui +QT = core testlib SOURCES += tst_waitwithoutgui.cpp mac:CONFIG -= app_bundle diff --git a/tests/auto/selftests/warnings/warnings.pro b/tests/auto/selftests/warnings/warnings.pro index eaf06b4..0c6ca01 100644 --- a/tests/auto/selftests/warnings/warnings.pro +++ b/tests/auto/selftests/warnings/warnings.pro @@ -1,6 +1,5 @@ -load(qttest_p4) SOURCES += tst_warnings.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/selftests/xunit/xunit.pro b/tests/auto/selftests/xunit/xunit.pro index 55aca4a..d3ae402 100644 --- a/tests/auto/selftests/xunit/xunit.pro +++ b/tests/auto/selftests/xunit/xunit.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +QT = core testlib SOURCES += tst_xunit.cpp mac:CONFIG -= app_bundle -- cgit v0.12 From 9a8b3bfaeb7c1e4f1c25bfda6de37de0c506ed1a Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 21 Dec 2011 11:51:19 +0200 Subject: Symbian: Fix qcssparser autotest No need to deploy "c:/windows/fonts/times.ttf" into Symbian devices, as they already have that font by default. The code that loads this file is only executed in WinCE, so it was never used in Symbian, anyway. Task-number: ou1cimx1#957049 Reviewed-by: mread --- tests/auto/qcssparser/qcssparser.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro index fc3daa3..0600860 100644 --- a/tests/auto/qcssparser/qcssparser.pro +++ b/tests/auto/qcssparser/qcssparser.pro @@ -10,8 +10,11 @@ requires(contains(QT_CONFIG,private_tests)) wince*|symbian: { addFiles.files = testdata addFiles.path = . + DEPLOYMENT += addFiles +} +wince* { timesFont.files = c:/windows/fonts/times.ttf timesFont.path = . - DEPLOYMENT += addFiles timesFont + DEPLOYMENT += timesFont } -- cgit v0.12 From aa3351315c9cb2c76933918635c007c1c57ccbf9 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 21 Dec 2011 12:24:39 +0200 Subject: Symbian: Fix SRCDIR usage in qlayout autotest. SRCDIR was not defined at all in Symbian builds. Task-number: ou1cimx1#957098 Reviewed-by: mread --- tests/auto/qlayout/tst_qlayout.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index 96f8863..be3998f 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -60,6 +60,10 @@ # include #endif +#if defined(Q_OS_SYMBIAN) +# define SRCDIR "." +#endif + //TESTED_CLASS= //TESTED_FILES= -- cgit v0.12 From dfe97e359443671f0cea9cddbe2ba0eccbaf48ce Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 21 Dec 2011 15:47:17 +0200 Subject: Symbian: Fix exporting and importing of some functions for autotests Symbian builds seem more strict about properly declaring exports than other builds, so added proper exporting and importing to some function declarations. Task-number: ou1cimx1#957184 Reviewed-by: mread --- src/gui/graphicsview/qgraphicsitem.cpp | 2 +- src/gui/graphicsview/qgraphicsview.cpp | 2 +- src/gui/painting/qmatrix.cpp | 2 +- src/gui/painting/qpainter.cpp | 2 +- src/gui/painting/qpdf.cpp | 2 +- src/gui/painting/qtransform.cpp | 2 +- .../declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp | 2 +- tests/auto/qgl/tst_qgl.cpp | 2 +- tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp | 2 +- tests/auto/qpixmapcache/tst_qpixmapcache.cpp | 2 +- tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp | 2 +- tests/auto/qregion/tst_qregion.cpp | 2 +- tests/auto/qscriptcontext/tst_qscriptcontext.cpp | 2 +- tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 2 +- tests/auto/qtextedit/tst_qtextedit.cpp | 2 +- tests/auto/qtextlayout/tst_qtextlayout.cpp | 4 ++-- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 9ea0b83..532af24 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -9509,7 +9509,7 @@ QVariant QGraphicsLineItem::extension(const QVariant &variant) const QPixmap::createHeuristicMask(). The performance and memory consumption is similar to MaskShape. */ -extern QPainterPath qt_regionToPath(const QRegion ®ion); +extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion ®ion); class QGraphicsPixmapItemPrivate : public QGraphicsItemPrivate { diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index d2e21fb..4e6f916 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1023,7 +1023,7 @@ void QGraphicsViewPrivate::freeStyleOptionsArray(QStyleOptionGraphicsItem *array delete [] array; } -extern QPainterPath qt_regionToPath(const QRegion ®ion); +extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion ®ion); /*! ### Adjustments in findItems: mapToScene(QRect) forces us to adjust the diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp index 6209e66..2c91f1d 100644 --- a/src/gui/painting/qmatrix.cpp +++ b/src/gui/painting/qmatrix.cpp @@ -654,7 +654,7 @@ QPolygonF QMatrix::map(const QPolygonF &a) const \sa QMatrix::map() */ -extern QPainterPath qt_regionToPath(const QRegion ®ion); +extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion ®ion); /*! \fn QRegion QMatrix::map(const QRegion ®ion) const diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 72357a6..619dbdd 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -2663,7 +2663,7 @@ QRegion QPainter::clipRegion() const return region; } -extern QPainterPath qt_regionToPath(const QRegion ®ion); +extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion ®ion); /*! Returns the currently clip as a path. Note that the clip path is diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 958e499..2954190 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -1231,7 +1231,7 @@ void QPdfBaseEngine::setupGraphicsState(QPaintEngine::DirtyFlags flags) setPen(); } -extern QPainterPath qt_regionToPath(const QRegion ®ion); +extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion ®ion); void QPdfBaseEngine::updateClipPath(const QPainterPath &p, Qt::ClipOperation op) { diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 4d7b339..be263bb 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1454,7 +1454,7 @@ QPolygon QTransform::map(const QPolygon &a) const \sa QTransform::map() */ -extern QPainterPath qt_regionToPath(const QRegion ®ion); +extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion ®ion); /*! \fn QRegion QTransform::map(const QRegion ®ion) const diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index aa4c014..cb6b2f6 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -52,7 +52,7 @@ #endif QT_BEGIN_NAMESPACE -extern int qt_defaultDpi(); +extern Q_GUI_EXPORT int qt_defaultDpi(); QT_END_NAMESPACE class tst_qdeclarativevaluetypes : public QObject diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 9c51e02..27c8ced 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -648,7 +648,7 @@ void tst_QGL::getSetCheck() #ifdef QT_BUILD_INTERNAL QT_BEGIN_NAMESPACE -extern QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString); +extern Q_AUTOTEST_EXPORT QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString); QT_END_NAMESPACE #endif diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp index 7296f34..148f355 100644 --- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE extern void qt_x11_wait_for_window_manager(QWidget *w); #endif #if !defined(Q_WS_WIN) -extern bool qt_tab_all_widgets; +extern Q_GUI_EXPORT bool qt_tab_all_widgets; #endif QT_END_NAMESPACE diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp index b36cf98..b5d8887 100644 --- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp +++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp @@ -499,7 +499,7 @@ void tst_QPixmapCache::pixmapKey() } QT_BEGIN_NAMESPACE -extern int q_QPixmapCache_keyHashSize(); +extern Q_AUTOTEST_EXPORT int q_QPixmapCache_keyHashSize(); QT_END_NAMESPACE void tst_QPixmapCache::noLeak() diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp index 5634285..7b7784c 100644 --- a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp +++ b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp @@ -425,7 +425,7 @@ void tst_QPixmapFilter::dropShadowBoundingRectFor() } QT_BEGIN_NAMESPACE -void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); +Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); QT_END_NAMESPACE void tst_QPixmapFilter::blurIndexed8() diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/qregion/tst_qregion.cpp index bbc09c9..f06d848 100644 --- a/tests/auto/qregion/tst_qregion.cpp +++ b/tests/auto/qregion/tst_qregion.cpp @@ -977,7 +977,7 @@ void tst_QRegion::regionToPath_data() #ifdef QT_BUILD_INTERNAL QT_BEGIN_NAMESPACE -extern QPainterPath qt_regionToPath(const QRegion ®ion); +extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion ®ion); QT_END_NAMESPACE #endif diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp index 14c204e..435b5e2 100644 --- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp +++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp @@ -53,7 +53,7 @@ Q_DECLARE_METATYPE(QScriptValueList) Q_DECLARE_METATYPE(QScriptContext::Error) QT_BEGIN_NAMESPACE -extern bool qt_script_isJITEnabled(); +extern Q_AUTOTEST_EXPORT bool qt_script_isJITEnabled(); QT_END_NAMESPACE class tst_QScriptContext : public QObject diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index e350d1e..fc14dbc 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp +++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp @@ -666,7 +666,7 @@ void tst_QSvgRenderer::testGzLoading() #ifdef QT_BUILD_INTERNAL QT_BEGIN_NAMESPACE -QByteArray qt_inflateGZipDataFrom(QIODevice *device); +Q_AUTOTEST_EXPORT QByteArray qt_inflateGZipDataFrom(QIODevice *device); QT_END_NAMESPACE #endif diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 73d09f4..186623b 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -1968,7 +1968,7 @@ void tst_QTextEdit::setText() } QT_BEGIN_NAMESPACE -extern void qt_setQtEnableTestFont(bool value); +extern Q_AUTOTEST_EXPORT void qt_setQtEnableTestFont(bool value); QT_END_NAMESPACE void tst_QTextEdit::fullWidthSelection_data() diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp index 67d8269..68f93e1 100644 --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp @@ -174,7 +174,7 @@ void tst_QTextLayout::getSetCheck() } QT_BEGIN_NAMESPACE -extern void qt_setQtEnableTestFont(bool value); +extern Q_AUTOTEST_EXPORT void qt_setQtEnableTestFont(bool value); QT_END_NAMESPACE tst_QTextLayout::tst_QTextLayout() @@ -1109,7 +1109,7 @@ void tst_QTextLayout::tabsForRtl() } QT_BEGIN_NAMESPACE -extern int qt_defaultDpiY(); +extern Q_GUI_EXPORT int qt_defaultDpiY(); QT_END_NAMESPACE void tst_QTextLayout::testTabDPIScale() -- cgit v0.12 From 1fba581749261acfb15513534156dc3d7881f771 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Thu, 22 Dec 2011 12:24:08 +0100 Subject: New style sheet for offline (QCH) documentation This stylesheet makes the Qt Reference docs look the same as the Qt Creator docs. --- doc/src/template/images/arrow.png | Bin 0 -> 1071 bytes doc/src/template/images/bgrContent.png | Bin 0 -> 149 bytes doc/src/template/images/blu_dot.png | Bin 0 -> 168 bytes doc/src/template/images/btn_next.png | Bin 0 -> 689 bytes doc/src/template/images/btn_prev.png | Bin 0 -> 676 bytes doc/src/template/images/home.png | Bin 0 -> 1076 bytes doc/src/template/images/ico_note.png | Bin 0 -> 649 bytes doc/src/template/images/ico_note_attention.png | Bin 0 -> 529 bytes doc/src/template/images/ico_out.png | Bin 0 -> 362 bytes doc/src/template/style/offline.css | 1293 +++++++++++----------- tools/qdoc3/test/qt-html-default-styles.qdocconf | 11 +- tools/qdoc3/test/qt-html-templates.qdocconf | 9 + 12 files changed, 635 insertions(+), 678 deletions(-) create mode 100755 doc/src/template/images/arrow.png create mode 100755 doc/src/template/images/bgrContent.png create mode 100755 doc/src/template/images/blu_dot.png create mode 100755 doc/src/template/images/btn_next.png create mode 100755 doc/src/template/images/btn_prev.png create mode 100755 doc/src/template/images/home.png create mode 100755 doc/src/template/images/ico_note.png create mode 100755 doc/src/template/images/ico_note_attention.png create mode 100755 doc/src/template/images/ico_out.png diff --git a/doc/src/template/images/arrow.png b/doc/src/template/images/arrow.png new file mode 100755 index 0000000..f2a83a5 Binary files /dev/null and b/doc/src/template/images/arrow.png differ diff --git a/doc/src/template/images/bgrContent.png b/doc/src/template/images/bgrContent.png new file mode 100755 index 0000000..1a81b03 Binary files /dev/null and b/doc/src/template/images/bgrContent.png differ diff --git a/doc/src/template/images/blu_dot.png b/doc/src/template/images/blu_dot.png new file mode 100755 index 0000000..c332148 Binary files /dev/null and b/doc/src/template/images/blu_dot.png differ diff --git a/doc/src/template/images/btn_next.png b/doc/src/template/images/btn_next.png new file mode 100755 index 0000000..f7bc2b7 Binary files /dev/null and b/doc/src/template/images/btn_next.png differ diff --git a/doc/src/template/images/btn_prev.png b/doc/src/template/images/btn_prev.png new file mode 100755 index 0000000..10a620c Binary files /dev/null and b/doc/src/template/images/btn_prev.png differ diff --git a/doc/src/template/images/home.png b/doc/src/template/images/home.png new file mode 100755 index 0000000..8de6d0c Binary files /dev/null and b/doc/src/template/images/home.png differ diff --git a/doc/src/template/images/ico_note.png b/doc/src/template/images/ico_note.png new file mode 100755 index 0000000..1379404 Binary files /dev/null and b/doc/src/template/images/ico_note.png differ diff --git a/doc/src/template/images/ico_note_attention.png b/doc/src/template/images/ico_note_attention.png new file mode 100755 index 0000000..b85b696 Binary files /dev/null and b/doc/src/template/images/ico_note_attention.png differ diff --git a/doc/src/template/images/ico_out.png b/doc/src/template/images/ico_out.png new file mode 100755 index 0000000..ff6e458 Binary files /dev/null and b/doc/src/template/images/ico_out.png differ diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css index d33d8e7..6f522f0 100644 --- a/doc/src/template/style/offline.css +++ b/doc/src/template/style/offline.css @@ -1,681 +1,620 @@ -@media screen -{ +body{ +font: normal 400 14px/1.2 Arial; +margin-top:85px; +font-family: Arial, Helvetica; +color:#313131; +text-align:justify; +margin-left:5px; +margin-right:5px; +} + +img{ +-moz-box-shadow: 3px 3px 3px #ccc; +-webkit-box-shadow: 3px 3px 3px #ccc; +box-shadow: 3px 3px 3px #ccc; +border:#8E8D8D 2px solid; +margin-left:0px; +max-width: 800px; +height: auto +} + +b{ +font-weight:600; +} + +.content{} + +.descr{ +margin-top:35px; +/*max-width: 75%;*/ +margin-left:5px; +text-align:justify; +min-height:700px; +vertical-align:top; +} + +.name{ +max-width: 75%; +font-weight:100; +} + +tt{ +text-align:left;} -/* basic elements */ - html - { - color: #000000; - background: #FFFFFF; - } - table - { - border-collapse: collapse; - border-spacing: 0; - } - fieldset, img - { - border: 0; - max-width:100%; - } - address, caption, cite, code, dfn, em, strong, th, var, optgroup - { - font-style: inherit; - font-weight: inherit; - } - del, ins - { - text-decoration: none; - } - ol li - { - list-style: decimal; - } - ul li - { - list-style: none; - } - caption, th - { - text-align: left; - } - h1, h2, h3, h4, h5, h6 - { - font-size: 100%; - } - q:before, q:after - { - content: ''; - } - abbr, acronym - { - border: 0; - font-variant: normal; - } - sup, sub - { - vertical-align: baseline; - } - tt, .qmlreadonly span, .qmldefault span - { - word-spacing:0.5em; - } - legend - { - color: #000000; - } - strong - { - font-weight: bold; - } - em - { - font-style: italic; - } - - body - { - margin: 0px; - font-family: sans-serif; - line-height: normal - } - a - { - color: #00732F; - text-decoration: none; - } - hr - { - background-color: #E6E6E6; - border: 1px solid #E6E6E6; - height: 1px; - width: 100%; - text-align: left; - margin: 1.5em 0 1.5em 0; - } - - pre - { - border: 1px solid #DDDDDD; - -moz-border-radius: 0.7em 0.7em 0.7em 0.7em; - -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em; - border-radius: 0.7em 0.7em 0.7em 0.7em; - margin: 0 1.5em 1em 1em; - padding: 1em 1em 1em 1em; - overflow-x: auto; - } - table, pre - { - -moz-border-radius: 0.7em 0.7em 0.7em 0.7em; - -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em; - border-radius: 0.7em 0.7em 0.7em 0.7em; - background-color: #F6F6F6; - border: 1px solid #E6E6E6; - border-collapse: separate; - margin-bottom: 2.5em; - } - pre { - font-size: 90%; - display: block; - overflow:hidden; - } - thead - { - margin-top: 0.5em; - font-weight: bold - } - th - { - padding: 0.5em 1.5em 0.5em 1em; - background-color: #E1E1E1; - border-left: 1px solid #E6E6E6; - } - td - { - padding: 0.25em 1.5em 0.25em 1em; - } - - td.rightAlign - { - padding: 0.25em 0.5em 0.25em 1em; - } - table tr.odd - { - border-left: 1px solid #E6E6E6; - background-color: #F6F6F6; - color: black; - } - table tr.even - { - border-left: 1px solid #E6E6E6; - background-color: #ffffff; - color: #202020; - } - - div.float-left - { - float: left; margin-right: 2em - } - div.float-right - { - float: right; margin-left: 2em - } - - span.comment - { - color: #008B00; - } - span.string, span.char - { - color: #000084; - } - span.number - { - color: #a46200; - } - span.operator - { - color: #202020; - } - span.keyword - { - color: #840000; - } - span.name - { - color: black - } - span.type - { - font-weight: bold - } - span.type a:visited - { - color: #0F5300; - } - span.preprocessor - { - color: #404040 - } -/* end basic elements */ - -/* font style elements */ - .heading - { - font-weight: bold; - font-size: 125%; - } - .subtitle - { - font-size: 110% - } - .small-subtitle - { - font-size: 100% - } - .red - { - color:red; - } -/* end font style elements */ - -/* global settings*/ - .header, .footer - { - display: block; - clear: both; - overflow: hidden; - } -/* end global settings*/ - -/* header elements */ - .header .qtref - { - color: #00732F; - font-weight: bold; - font-size: 130%; - } - - .header .content - { - margin-left: 5px; - margin-top: 5px; - margin-bottom: 0.5em; - } - - .header .breadcrumb - { - font-size: 90%; - padding: 0.5em 0 0.5em 1em; - margin: 0; - background-color: #fafafa; - height: 1.35em; - border-bottom: 1px solid #d1d1d1; - } - - .header .breadcrumb ul - { - margin: 0; - padding: 0; - } - - .header .content - { - word-wrap: break-word; - } - - .header .breadcrumb ul li - { - float: left; - background: url(../images/breadcrumb.png) no-repeat 0 3px; - padding-left: 1.5em; - margin-left: 1.5em; - } - - .header .breadcrumb ul li.last - { - font-weight: normal; - } - - .header .breadcrumb ul li a - { - color: #00732F; - } - - .header .breadcrumb ul li.first - { - background-image: none; - padding-left: 0; - margin-left: 0; - } - - .header .content ol li { - background: none; - margin-bottom: 1.0em; - margin-left: 1.2em; - padding-left: 0 - } - - .header .content li - { - background: url(../images/bullet_sq.png) no-repeat 0 5px; - margin-bottom: 1em; - padding-left: 1.2em; - } - -/* end header elements */ - -/* content elements */ - .content h1 - { - font-weight: bold; - font-size: 130% - } - - .content h2 - { - font-weight: bold; - font-size: 120%; - width: 100%; - } - .content h3 - { - font-weight: bold; - font-size: 110%; - width: 100%; - } - .content table p - { - margin: 0 - } - .content ul - { - padding-left: 2.5em; - } - .content li - { - padding-top: 0.25em; - padding-bottom: 0.25em; - } - .content ul img { - vertical-align: middle; - } - - .content a:visited - { - color: #4c0033; - text-decoration: none; - } - - .content a:visited:hover - { - color: #4c0033; - text-decoration: underline; - } - - a:hover - { - color: #4c0033; - text-decoration: underline; - } - descr p a - { - text-decoration: underline; - } - - .descr p a:visited - { - text-decoration: underline; - } - - .alphaChar{ - width:95%; - background-color:#F6F6F6; - border:1px solid #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - font-size:12pt; - padding-left:10px; - margin-top:10px; - margin-bottom:10px; - } - .flowList{ - /*vertical-align:top;*/ - /*margin:20px auto;*/ - - column-count:3; - -webkit-column-count:3; - -moz-column-count:3; /* - column-width:100%; - -webkit-column-width:200px; - -col-column-width:200px; +----------- +links +----------- */ - column-gap:41px; - -webkit-column-gap:41px; - -moz-column-gap:41px; - - column-rule: 1px dashed #ccc; - -webkit-column-rule: 1px dashed #ccc; - -moz-column-rule: 1px dashed #ccc; - } - - .flowList dl{ - } - .flowList dd{ - /*display:inline-block;*/ - margin-left:10px; - min-width:250px; - line-height: 1.5; - min-width:100%; - min-height:15px; - } - - .flowList dd a{ - } - - .mainContent - { - padding-left:5px; - } - - .content .flowList p{ - padding:0px; - } - - .content .alignedsummary - { - margin: 15px; - } - - - .qmltype - { - text-align: center; - font-size: 120%; - } - .qmlreadonly - { - padding-left: 5px; - float: right; - color: #254117; - } - - .qmldefault - { - padding-left: 5px; - float: right; - color: red; - } - - .qmldoc - { - } - - .generic .alphaChar{ - margin-top:5px; - } - - .generic .odd .alphaChar{ - background-color: #F6F6F6; - } - - .generic .even .alphaChar{ - background-color: #FFFFFF; - } - - .memItemRight{ - padding: 0.25em 1.5em 0.25em 0; - } - .highlightedCode - { - margin: 1.0em; - } - .annotated td { - padding: 0.25em 0.5em 0.25em 0.5em; - } - - .toc - { - font-size: 80% - } - - .header .content .toc ul - { - padding-left: 0px; - } - - .content .toc h3 { - border-bottom: 0px; - margin-top: 0px; - } - - .content .toc h3 a:hover { - color: #00732F; - text-decoration: none; - } - - .content .toc .level2 - { - margin-left: 1.5em; - } - - .content .toc .level3 - { - margin-left: 3.0em; - } - - .content ul li - { - background: url(../images/bullet_sq.png) no-repeat 0 0.7em; - padding-left: 1em - } - - .content .toc li - { - background: url(../images/bullet_dn.png) no-repeat 0 5px; - padding-left: 1em - } - - .relpage - { - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - border: 1px solid #DDDDDD; - padding: 25px 25px; - clear: both; - } - .relpage ul - { - float: none; - padding: 1.5em; - } - - h3.fn, span.fn - { - -moz-border-radius:7px 7px 7px 7px; - -webkit-border-radius:7px 7px 7px 7px; - border-radius:7px 7px 7px 7px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - font-weight: bold; - word-spacing:3px; - padding:3px 5px; - } - - .functionIndex { - font-size:12pt; - word-spacing:10px; - margin-bottom:10px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - width:100%; - } - - .centerAlign - { - text-align:center; - } - - .rightAlign - { - text-align:right; - } - - .leftAlign - { - text-align:left; - } - - .topAlign{ - vertical-align:top - } - - .functionIndex a{ - display:inline-block; - } - -/* end content elements */ -/* footer elements */ - - .footer - { - color: #393735; - font-size: 0.75em; - text-align: center; - padding-top: 1.5em; - padding-bottom: 1em; - background-color: #E6E7E8; - margin: 0; - } - .footer p - { - margin: 0.25em - } - .small - { - font-size: 0.5em; - } -/* end footer elements */ - - .item { - float: left; - position: relative; - width: 100%; - overflow: hidden; - } - - - .item .primary { - margin-right: 220px; - position: relative; - } - - .item hr { - margin-left: -220px; - } - - .item .secondary { - float: right; - width: 200px; - position: relative; - } - - .item .cols { - clear: both; - display: block; - } - - .item .cols .col { - float: left; - margin-left: 1.5%; - } - - .item .cols .col.first { - margin-left: 0; - } - - .item .cols.two .col { - width: 45%; - } - - .item .box { - margin: 0 0 10px 0; - } - - .item .box h3 { - margin: 0 0 10px 0; - } - - .cols.unclear { - clear:none; - } -} - -/* end of screen media */ - -/* start of print media */ - -@media print + +a:link{ +color: #2C418D; +text-decoration: none; +text-align:left; +} + +a:hover{ +color: #869CD1; +text-decoration:underline; +text-align:left; +} + +a:visited{ +color: #869CD1; +text-decoration: none; +text-align:left; +} + +a:visited:hover{ +text-decoration:underline; +text-align:left; +} + +a[href*="http://"], a[href*="ftp://"],a[href*="https://"] { - input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult - { - display: none; - background: none; - } - .content - { - background: none; - display: block; - width: 100%; margin: 0; float: none; - } -} -/* end of print media */ +text-decoration: none; +background-image:url(../images/ico_out.png); +background-repeat:no-repeat; +background-position:left; +padding-left:20px; +text-align:left; +} + +.flags{ +text-decoration:none; +text-height:24px; +} + +/* +------------------------------- +NOTE styles +------------------------------- +*/ +.notetitle, .tiptitle, .fastpathtitle{ +font-weight:bold; +} + +.attentiontitle,.cautiontitle,.dangertitle,.importanttitle,.remembertitle,.restrictiontitle{ +font-weight:bold; +} + +.note,.tip,.fastpath{ +background: #F2F2F2 url(../images/ico_note.png); +background-repeat: no-repeat; +background-position: top left; +padding:5px; +padding-left:40px; +padding-bottom:10px; +border:#999 1px dotted; +color:#666666; +margin:5px; +} + +.attention,.caution,.danger,.important,.remember,.restriction{ +background: #F2F2F2 url(../images/ico_note_attention.png); +background-repeat:no-repeat; +background-position:top left; +padding:5px; +padding-left:40px; +padding-bottom:10px; +border:#999 1px dotted; +color:#666666; +margin:5px; +} + +/* +------------------------------- +Top navigation +------------------------------- +*/ + +.header{ + +height:1px; +padding:0px; +margin:0px; +} + +.qtref{ +display: block; +position: relative; +top: -76px; +height:15px; +z-index: 1; +font-size:11px; +padding-right:10px; +float:right; +} + +.naviNextPrevious{ +display: block; +position: relative; +text-align: right; +top: -53px; +float:right; +height:20px; +z-index:1; +padding-right:10px; +padding-top:2px; +vertical-align:top; +margin:0px; +} + + +.naviNextPrevious > a:first-child{ +background-image:url(../images/btn_prev.png); +background-repeat:no-repeat; +background-position:left; +padding-left:20px; +height:20px; +padding-left:20px; +} + +.naviNextPrevious > a:last-child{ +background-image:url(../images/btn_next.png); +background-repeat:no-repeat; +background-position:right; +padding-right:20px; +height:20px; +margin-left:30px; +} + +.breadcrumb{ +display: block; +position: relative; +top:-20px; +border-top:2px solid #ffffff; +border-bottom: 1px solid #cecece; +background-color:#F2F2F2; +z-index:1; +height:20px; +padding:0px; +margin:0px; +padding-left:10px; +padding-top:2px; +} + +.breadcrumb ul{ + margin:0px; + padding:0px; +} + +.breadcrumb ul li{ +background-color:#F2F2F2; +list-style-type:none; +padding:0; +margin:0; +height:20px; +} + +.breadcrumb li{ +float:left; +} + +.breadcrumb .first { +background:url(../images/home.png); +background-position:left; +background-repeat:no-repeat; +padding-left:20px; +} + + +.breadcrumb li a{ +color:#2C418D; +display:block; +text-decoration:none; +background:url(../images/arrow.png); +background-repeat:no-repeat; +background-position:right; +padding-right:25px; +padding-left:10px; +} + +.breadcrumb li a:hover{ +color:#909090; +display:block; +text-decoration:none; +background:url(../images/arrow.png); +background-repeat:no-repeat; +background-position:right; +padding-right:20px; +padding-left:10px; +} + + +/* table of content +no display +*/ + +/* +----------- +headers +----------- +*/ + + +@media screen{ +.title{ +color:#313131; +font-size: 18px; +font-weight: normal; +left: 0; +padding-bottom: 20px; +padding-left: 10px; +padding-top: 20px; +position: absolute; +right: 0; +top: 0; +background-color:#E6E6E6; +border-bottom: 1px #CCC solid; +border-top: 2px #CCC solid; +font-weight:bold; +margin-left:5px; +margin-right:5px; +} +} + +h1 { +margin: 0; +} + +h2, p.h2 { +font: 500 16px/1.2 Arial; +font-weight:100; +background-color:#F2F3F4; +padding:4px; +margin-bottom:30px; +margin-top:30px; +border-top:#E0E0DE 1px solid; +border-bottom: #E0E0DE 1px solid; +max-width: 99%; +} + +h3{ + +font: 500 14px/1.2 Arial; +font-weight:100; +text-decoration:underline; +margin-bottom:30px; +margin-top:30px; +} + +h3.fn,span.fn{ +border-width: 1px; +border-style: solid; +border-color: #E6E6E6; +-moz-border-radius: 7px 7px 7px 7px; +-webkit-border-radius: 7px 7px 7px 7px; +border-radius: 7px 7px 7px 7px; +background-color: #F6F6F6; +word-spacing: 3px; +padding: 5px 5px; +text-decoration:none; +font-weight:bold; +max-width:75%; +font-size:14px; +margin:0px; +margin-top:30px; + +} + +.name{ +color:#1A1A1A; +} +.type{ +color:#808080; +} + + + +@media print { +.title { +color:#0066CB; +font-family:Arial, Helvetica; +font-size: 32px; +font-weight: normal; +left: 0; +position: absolute; +right: 0; +top: 0; +} +} + + +/* +----------------- +table styles +----------------- +*/ +.table img { +border:none; +margin-left:0px; +-moz-box-shadow:0px 0px 0px #fff; +-webkit-box-shadow: 0px 0px 0px #fff; +box-shadow: 0px 0px 0px #fff; +} + +/* table with border alternative colours*/ + + table,pre{ +-moz-border-radius: 7px 7px 7px 7px; +-webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; +background-color: #F6F6F6; +border: 1px solid #E6E6E6; +border-collapse: separate; +font-size: 12px; +line-height: 1.2; +margin-bottom: 25px; +margin-left: 15px; +font-size: 12px; +line-height: 1.2; +margin-bottom: 25px; +margin-left: 15px; +} + + +table th{ +text-align:left; +padding-left:20px; +} + +table td { +padding: 3px 15px 3px 20px; +border-bottom:#CCC dotted 1px; +} +table p { margin:0px;} + +table tr.even { +background-color: white; +color: #66666E; +} + +table tr.odd { +background-color: #F6F6F6; +color: #66666E; +} + + +table thead { +text-align:left; +padding-left:20px; +background-color:#e1e0e0; +border-left:none; +border-right:none; +} + +table thead th { +padding-top:5px; +padding-left:10px; +padding-bottom:5px; +border-bottom: 2px solid #D1D1D1; +padding-right:10px; +} + + +/* table bodless & white*/ + +.borderless { +border-radius: 0px 0px 0px 0px; +background-color: #fff; +border: 1px solid #fff; +} + +.borderless tr { +background-color: #FFF; +color: #66666E; +} + +.borderless td { +border:none; +border-bottom:#fff dotted 1px; +} + +/* +----------- +List +----------- +*/ + +ul{ +padding-bottom:2px; +} + +li { +margin-bottom: 10px; +padding-left: 8px; +list-style:outside; +list-style-type:square; +text-align:left; +} + + +ol{ +margin:10px; +padding:0; +} + +ol > li{ +margin-left: 30px; +padding-left:8px; +list-style:decimal; +} + +.centerAlign{ +text-align: left; +} + +.cpp{ +display: block; +margin: 10; +overflow: hidden; +overflow-x: hidden; +overflow-y: hidden; +padding: 20px 0 20px 0; +} + +.footer{ +margin-top: 50px; +padding-left:5px; +margin-bottom: 10px; +font-size:10px; +border-top: 1px solid #999; +padding-top:11px; +} + +.footerNavi{ +width:auto; +text-align:right; +margin-top:50px; +z-index:1; +} + +.memItemLeft{ +padding-right: 3px; +} + +.memItemRight{ +padding: 3px 15px 3px 0; +} + +.qml{ +display: block; +margin: 10; +overflow: hidden; +overflow-x: hidden; +overflow-y: hidden; +padding: 20px 0 20px 0; +} + +.qmldefault{ +padding-left: 5px; +float: right; +color: red; +} + +.qmlreadonly{ +padding-left: 5px; +float: right; +color: #254117; +} + +.rightAlign{ +padding: 3px 5px 3px 10px; +text-align: right; +} + +/* +----------- +Content table +----------- +*/ + +@media print{ +.toc { +float: right; +padding-bottom: 10px; +padding-top: 50px; +width: 100%; +background-image:url(../images/bgrContent.png); +background-position:top; +background-repeat:no-repeat; +} +} + +@media screen{ +.toc{ +clear:both; +float:right; +vertical-align:top; +-moz-border-radius: 7px 7px 7px 7px; +-webkit-border-radius: 7px 7px 7px 7px; +border-radius: 7px 7px 7px 7px; + background:#FFF url(../images/bgrContent.png); +background-position:top; +background-repeat:repeat-x; +border: 1px solid #E6E6E6; +padding-left:5px; +padding-bottom:10px; +height: auto; +width: 200px; +text-align:left; +z-index:2; +margin-left:20px; +margin-right:20px; +margin-top:0px; +padding-top:0px; +} +} + +.toc h3{ +text-decoration:none; +} + +.toc h3{font: 500 14px/1.2 Arial; +font-weight:100; +padding:0px; +margin:0px; +padding-top:5px; +padding-left:5px; +} + + +.toc ul{ +width:160px; +padding-left:10px; +padding-right:5px; +padding-bottom:10px; +padding-top:10px; +} + +.toc ul li{ +margin-left:20px; +list-style-image:url(../images/blu_dot.png); +list-style:outside; + +} + + +.toc ul li a:link{ +color: #2C418D; +text-decoration: none; +} + +.toc ul li a:hover{ +color: #869CD1; +text-decoration:underline; + +} + +.toc ul li a:visited{ +color: #869CD1; +font-weight: bold; +} + +.level1{ +border:none;} + +.clearfix{ +clear:both;} + diff --git a/tools/qdoc3/test/qt-html-default-styles.qdocconf b/tools/qdoc3/test/qt-html-default-styles.qdocconf index 0db36bc..b8d95e5 100644 --- a/tools/qdoc3/test/qt-html-default-styles.qdocconf +++ b/tools/qdoc3/test/qt-html-default-styles.qdocconf @@ -2,7 +2,7 @@ # specified relative to the template directory and will be copied into # subdirectories of the output directory. -HTML.templatedir = $QT_SOURCE_TREE/doc/src/template +HTML.templatedir = $MODULE_SOURCE_TREE/doc/src/template HTML.stylesheets = style/offline.css @@ -13,13 +13,22 @@ HTML.scripts = # directory prefixes. extraimages.HTML = qt-logo.png \ + arrow.png \ arrow_down.png \ + bgrContent.png \ breadcrumb.png \ + blu_dot.png \ + btn_next.png \ + btn_prev.png \ bullet_gt.png \ bullet_dn.png \ bullet_sq.png \ bullet_up.png \ + home.png \ horBar.png \ + ico_note.png \ + ico_note_attention.png \ + ico_out.png \ sprites-combined.png # Include the style sheets and scripts used. diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 4f0cb1f..69d00e9 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -43,13 +43,22 @@ HTML.footer = \ # Files not referenced in any qdoc file. # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ + images/arrow.png \ images/arrow_down.png \ + images/bgrContent.png \ + images/blu_dot.png \ + images/btn_next.png \ + images/btn_prev.png \ images/breadcrumb.png \ images/bullet_gt.png \ images/bullet_dn.png \ images/bullet_sq.png \ images/bullet_up.png \ + images/home.png \ images/horBar.png \ + images/ico_note.png \ + images/ico_note_attention.png \ + images/ico_out.png \ images/sprites-combined.png \ style/offline.css -- cgit v0.12 From 468f41d603868c28cebe17a6896da878da4552f9 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Thu, 22 Dec 2011 12:24:08 +0100 Subject: New style sheet for offline (QCH) documentation This stylesheet makes the Qt Reference docs look the same as the Qt Creator docs. --- doc/src/template/images/arrow.png | Bin 0 -> 1071 bytes doc/src/template/images/bgrContent.png | Bin 0 -> 149 bytes doc/src/template/images/blu_dot.png | Bin 0 -> 168 bytes doc/src/template/images/btn_next.png | Bin 0 -> 689 bytes doc/src/template/images/btn_prev.png | Bin 0 -> 676 bytes doc/src/template/images/home.png | Bin 0 -> 1076 bytes doc/src/template/images/ico_note.png | Bin 0 -> 649 bytes doc/src/template/images/ico_note_attention.png | Bin 0 -> 529 bytes doc/src/template/images/ico_out.png | Bin 0 -> 362 bytes doc/src/template/style/offline.css | 1293 +++++++++++----------- tools/qdoc3/test/qt-html-default-styles.qdocconf | 9 + tools/qdoc3/test/qt-html-templates.qdocconf | 9 + 12 files changed, 634 insertions(+), 677 deletions(-) create mode 100755 doc/src/template/images/arrow.png create mode 100755 doc/src/template/images/bgrContent.png create mode 100755 doc/src/template/images/blu_dot.png create mode 100755 doc/src/template/images/btn_next.png create mode 100755 doc/src/template/images/btn_prev.png create mode 100755 doc/src/template/images/home.png create mode 100755 doc/src/template/images/ico_note.png create mode 100755 doc/src/template/images/ico_note_attention.png create mode 100755 doc/src/template/images/ico_out.png diff --git a/doc/src/template/images/arrow.png b/doc/src/template/images/arrow.png new file mode 100755 index 0000000..f2a83a5 Binary files /dev/null and b/doc/src/template/images/arrow.png differ diff --git a/doc/src/template/images/bgrContent.png b/doc/src/template/images/bgrContent.png new file mode 100755 index 0000000..1a81b03 Binary files /dev/null and b/doc/src/template/images/bgrContent.png differ diff --git a/doc/src/template/images/blu_dot.png b/doc/src/template/images/blu_dot.png new file mode 100755 index 0000000..c332148 Binary files /dev/null and b/doc/src/template/images/blu_dot.png differ diff --git a/doc/src/template/images/btn_next.png b/doc/src/template/images/btn_next.png new file mode 100755 index 0000000..f7bc2b7 Binary files /dev/null and b/doc/src/template/images/btn_next.png differ diff --git a/doc/src/template/images/btn_prev.png b/doc/src/template/images/btn_prev.png new file mode 100755 index 0000000..10a620c Binary files /dev/null and b/doc/src/template/images/btn_prev.png differ diff --git a/doc/src/template/images/home.png b/doc/src/template/images/home.png new file mode 100755 index 0000000..8de6d0c Binary files /dev/null and b/doc/src/template/images/home.png differ diff --git a/doc/src/template/images/ico_note.png b/doc/src/template/images/ico_note.png new file mode 100755 index 0000000..1379404 Binary files /dev/null and b/doc/src/template/images/ico_note.png differ diff --git a/doc/src/template/images/ico_note_attention.png b/doc/src/template/images/ico_note_attention.png new file mode 100755 index 0000000..b85b696 Binary files /dev/null and b/doc/src/template/images/ico_note_attention.png differ diff --git a/doc/src/template/images/ico_out.png b/doc/src/template/images/ico_out.png new file mode 100755 index 0000000..ff6e458 Binary files /dev/null and b/doc/src/template/images/ico_out.png differ diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css index d33d8e7..6f522f0 100644 --- a/doc/src/template/style/offline.css +++ b/doc/src/template/style/offline.css @@ -1,681 +1,620 @@ -@media screen -{ +body{ +font: normal 400 14px/1.2 Arial; +margin-top:85px; +font-family: Arial, Helvetica; +color:#313131; +text-align:justify; +margin-left:5px; +margin-right:5px; +} + +img{ +-moz-box-shadow: 3px 3px 3px #ccc; +-webkit-box-shadow: 3px 3px 3px #ccc; +box-shadow: 3px 3px 3px #ccc; +border:#8E8D8D 2px solid; +margin-left:0px; +max-width: 800px; +height: auto +} + +b{ +font-weight:600; +} + +.content{} + +.descr{ +margin-top:35px; +/*max-width: 75%;*/ +margin-left:5px; +text-align:justify; +min-height:700px; +vertical-align:top; +} + +.name{ +max-width: 75%; +font-weight:100; +} + +tt{ +text-align:left;} -/* basic elements */ - html - { - color: #000000; - background: #FFFFFF; - } - table - { - border-collapse: collapse; - border-spacing: 0; - } - fieldset, img - { - border: 0; - max-width:100%; - } - address, caption, cite, code, dfn, em, strong, th, var, optgroup - { - font-style: inherit; - font-weight: inherit; - } - del, ins - { - text-decoration: none; - } - ol li - { - list-style: decimal; - } - ul li - { - list-style: none; - } - caption, th - { - text-align: left; - } - h1, h2, h3, h4, h5, h6 - { - font-size: 100%; - } - q:before, q:after - { - content: ''; - } - abbr, acronym - { - border: 0; - font-variant: normal; - } - sup, sub - { - vertical-align: baseline; - } - tt, .qmlreadonly span, .qmldefault span - { - word-spacing:0.5em; - } - legend - { - color: #000000; - } - strong - { - font-weight: bold; - } - em - { - font-style: italic; - } - - body - { - margin: 0px; - font-family: sans-serif; - line-height: normal - } - a - { - color: #00732F; - text-decoration: none; - } - hr - { - background-color: #E6E6E6; - border: 1px solid #E6E6E6; - height: 1px; - width: 100%; - text-align: left; - margin: 1.5em 0 1.5em 0; - } - - pre - { - border: 1px solid #DDDDDD; - -moz-border-radius: 0.7em 0.7em 0.7em 0.7em; - -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em; - border-radius: 0.7em 0.7em 0.7em 0.7em; - margin: 0 1.5em 1em 1em; - padding: 1em 1em 1em 1em; - overflow-x: auto; - } - table, pre - { - -moz-border-radius: 0.7em 0.7em 0.7em 0.7em; - -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em; - border-radius: 0.7em 0.7em 0.7em 0.7em; - background-color: #F6F6F6; - border: 1px solid #E6E6E6; - border-collapse: separate; - margin-bottom: 2.5em; - } - pre { - font-size: 90%; - display: block; - overflow:hidden; - } - thead - { - margin-top: 0.5em; - font-weight: bold - } - th - { - padding: 0.5em 1.5em 0.5em 1em; - background-color: #E1E1E1; - border-left: 1px solid #E6E6E6; - } - td - { - padding: 0.25em 1.5em 0.25em 1em; - } - - td.rightAlign - { - padding: 0.25em 0.5em 0.25em 1em; - } - table tr.odd - { - border-left: 1px solid #E6E6E6; - background-color: #F6F6F6; - color: black; - } - table tr.even - { - border-left: 1px solid #E6E6E6; - background-color: #ffffff; - color: #202020; - } - - div.float-left - { - float: left; margin-right: 2em - } - div.float-right - { - float: right; margin-left: 2em - } - - span.comment - { - color: #008B00; - } - span.string, span.char - { - color: #000084; - } - span.number - { - color: #a46200; - } - span.operator - { - color: #202020; - } - span.keyword - { - color: #840000; - } - span.name - { - color: black - } - span.type - { - font-weight: bold - } - span.type a:visited - { - color: #0F5300; - } - span.preprocessor - { - color: #404040 - } -/* end basic elements */ - -/* font style elements */ - .heading - { - font-weight: bold; - font-size: 125%; - } - .subtitle - { - font-size: 110% - } - .small-subtitle - { - font-size: 100% - } - .red - { - color:red; - } -/* end font style elements */ - -/* global settings*/ - .header, .footer - { - display: block; - clear: both; - overflow: hidden; - } -/* end global settings*/ - -/* header elements */ - .header .qtref - { - color: #00732F; - font-weight: bold; - font-size: 130%; - } - - .header .content - { - margin-left: 5px; - margin-top: 5px; - margin-bottom: 0.5em; - } - - .header .breadcrumb - { - font-size: 90%; - padding: 0.5em 0 0.5em 1em; - margin: 0; - background-color: #fafafa; - height: 1.35em; - border-bottom: 1px solid #d1d1d1; - } - - .header .breadcrumb ul - { - margin: 0; - padding: 0; - } - - .header .content - { - word-wrap: break-word; - } - - .header .breadcrumb ul li - { - float: left; - background: url(../images/breadcrumb.png) no-repeat 0 3px; - padding-left: 1.5em; - margin-left: 1.5em; - } - - .header .breadcrumb ul li.last - { - font-weight: normal; - } - - .header .breadcrumb ul li a - { - color: #00732F; - } - - .header .breadcrumb ul li.first - { - background-image: none; - padding-left: 0; - margin-left: 0; - } - - .header .content ol li { - background: none; - margin-bottom: 1.0em; - margin-left: 1.2em; - padding-left: 0 - } - - .header .content li - { - background: url(../images/bullet_sq.png) no-repeat 0 5px; - margin-bottom: 1em; - padding-left: 1.2em; - } - -/* end header elements */ - -/* content elements */ - .content h1 - { - font-weight: bold; - font-size: 130% - } - - .content h2 - { - font-weight: bold; - font-size: 120%; - width: 100%; - } - .content h3 - { - font-weight: bold; - font-size: 110%; - width: 100%; - } - .content table p - { - margin: 0 - } - .content ul - { - padding-left: 2.5em; - } - .content li - { - padding-top: 0.25em; - padding-bottom: 0.25em; - } - .content ul img { - vertical-align: middle; - } - - .content a:visited - { - color: #4c0033; - text-decoration: none; - } - - .content a:visited:hover - { - color: #4c0033; - text-decoration: underline; - } - - a:hover - { - color: #4c0033; - text-decoration: underline; - } - descr p a - { - text-decoration: underline; - } - - .descr p a:visited - { - text-decoration: underline; - } - - .alphaChar{ - width:95%; - background-color:#F6F6F6; - border:1px solid #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - font-size:12pt; - padding-left:10px; - margin-top:10px; - margin-bottom:10px; - } - .flowList{ - /*vertical-align:top;*/ - /*margin:20px auto;*/ - - column-count:3; - -webkit-column-count:3; - -moz-column-count:3; /* - column-width:100%; - -webkit-column-width:200px; - -col-column-width:200px; +----------- +links +----------- */ - column-gap:41px; - -webkit-column-gap:41px; - -moz-column-gap:41px; - - column-rule: 1px dashed #ccc; - -webkit-column-rule: 1px dashed #ccc; - -moz-column-rule: 1px dashed #ccc; - } - - .flowList dl{ - } - .flowList dd{ - /*display:inline-block;*/ - margin-left:10px; - min-width:250px; - line-height: 1.5; - min-width:100%; - min-height:15px; - } - - .flowList dd a{ - } - - .mainContent - { - padding-left:5px; - } - - .content .flowList p{ - padding:0px; - } - - .content .alignedsummary - { - margin: 15px; - } - - - .qmltype - { - text-align: center; - font-size: 120%; - } - .qmlreadonly - { - padding-left: 5px; - float: right; - color: #254117; - } - - .qmldefault - { - padding-left: 5px; - float: right; - color: red; - } - - .qmldoc - { - } - - .generic .alphaChar{ - margin-top:5px; - } - - .generic .odd .alphaChar{ - background-color: #F6F6F6; - } - - .generic .even .alphaChar{ - background-color: #FFFFFF; - } - - .memItemRight{ - padding: 0.25em 1.5em 0.25em 0; - } - .highlightedCode - { - margin: 1.0em; - } - .annotated td { - padding: 0.25em 0.5em 0.25em 0.5em; - } - - .toc - { - font-size: 80% - } - - .header .content .toc ul - { - padding-left: 0px; - } - - .content .toc h3 { - border-bottom: 0px; - margin-top: 0px; - } - - .content .toc h3 a:hover { - color: #00732F; - text-decoration: none; - } - - .content .toc .level2 - { - margin-left: 1.5em; - } - - .content .toc .level3 - { - margin-left: 3.0em; - } - - .content ul li - { - background: url(../images/bullet_sq.png) no-repeat 0 0.7em; - padding-left: 1em - } - - .content .toc li - { - background: url(../images/bullet_dn.png) no-repeat 0 5px; - padding-left: 1em - } - - .relpage - { - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - border: 1px solid #DDDDDD; - padding: 25px 25px; - clear: both; - } - .relpage ul - { - float: none; - padding: 1.5em; - } - - h3.fn, span.fn - { - -moz-border-radius:7px 7px 7px 7px; - -webkit-border-radius:7px 7px 7px 7px; - border-radius:7px 7px 7px 7px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - font-weight: bold; - word-spacing:3px; - padding:3px 5px; - } - - .functionIndex { - font-size:12pt; - word-spacing:10px; - margin-bottom:10px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - width:100%; - } - - .centerAlign - { - text-align:center; - } - - .rightAlign - { - text-align:right; - } - - .leftAlign - { - text-align:left; - } - - .topAlign{ - vertical-align:top - } - - .functionIndex a{ - display:inline-block; - } - -/* end content elements */ -/* footer elements */ - - .footer - { - color: #393735; - font-size: 0.75em; - text-align: center; - padding-top: 1.5em; - padding-bottom: 1em; - background-color: #E6E7E8; - margin: 0; - } - .footer p - { - margin: 0.25em - } - .small - { - font-size: 0.5em; - } -/* end footer elements */ - - .item { - float: left; - position: relative; - width: 100%; - overflow: hidden; - } - - - .item .primary { - margin-right: 220px; - position: relative; - } - - .item hr { - margin-left: -220px; - } - - .item .secondary { - float: right; - width: 200px; - position: relative; - } - - .item .cols { - clear: both; - display: block; - } - - .item .cols .col { - float: left; - margin-left: 1.5%; - } - - .item .cols .col.first { - margin-left: 0; - } - - .item .cols.two .col { - width: 45%; - } - - .item .box { - margin: 0 0 10px 0; - } - - .item .box h3 { - margin: 0 0 10px 0; - } - - .cols.unclear { - clear:none; - } -} - -/* end of screen media */ - -/* start of print media */ - -@media print + +a:link{ +color: #2C418D; +text-decoration: none; +text-align:left; +} + +a:hover{ +color: #869CD1; +text-decoration:underline; +text-align:left; +} + +a:visited{ +color: #869CD1; +text-decoration: none; +text-align:left; +} + +a:visited:hover{ +text-decoration:underline; +text-align:left; +} + +a[href*="http://"], a[href*="ftp://"],a[href*="https://"] { - input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult - { - display: none; - background: none; - } - .content - { - background: none; - display: block; - width: 100%; margin: 0; float: none; - } -} -/* end of print media */ +text-decoration: none; +background-image:url(../images/ico_out.png); +background-repeat:no-repeat; +background-position:left; +padding-left:20px; +text-align:left; +} + +.flags{ +text-decoration:none; +text-height:24px; +} + +/* +------------------------------- +NOTE styles +------------------------------- +*/ +.notetitle, .tiptitle, .fastpathtitle{ +font-weight:bold; +} + +.attentiontitle,.cautiontitle,.dangertitle,.importanttitle,.remembertitle,.restrictiontitle{ +font-weight:bold; +} + +.note,.tip,.fastpath{ +background: #F2F2F2 url(../images/ico_note.png); +background-repeat: no-repeat; +background-position: top left; +padding:5px; +padding-left:40px; +padding-bottom:10px; +border:#999 1px dotted; +color:#666666; +margin:5px; +} + +.attention,.caution,.danger,.important,.remember,.restriction{ +background: #F2F2F2 url(../images/ico_note_attention.png); +background-repeat:no-repeat; +background-position:top left; +padding:5px; +padding-left:40px; +padding-bottom:10px; +border:#999 1px dotted; +color:#666666; +margin:5px; +} + +/* +------------------------------- +Top navigation +------------------------------- +*/ + +.header{ + +height:1px; +padding:0px; +margin:0px; +} + +.qtref{ +display: block; +position: relative; +top: -76px; +height:15px; +z-index: 1; +font-size:11px; +padding-right:10px; +float:right; +} + +.naviNextPrevious{ +display: block; +position: relative; +text-align: right; +top: -53px; +float:right; +height:20px; +z-index:1; +padding-right:10px; +padding-top:2px; +vertical-align:top; +margin:0px; +} + + +.naviNextPrevious > a:first-child{ +background-image:url(../images/btn_prev.png); +background-repeat:no-repeat; +background-position:left; +padding-left:20px; +height:20px; +padding-left:20px; +} + +.naviNextPrevious > a:last-child{ +background-image:url(../images/btn_next.png); +background-repeat:no-repeat; +background-position:right; +padding-right:20px; +height:20px; +margin-left:30px; +} + +.breadcrumb{ +display: block; +position: relative; +top:-20px; +border-top:2px solid #ffffff; +border-bottom: 1px solid #cecece; +background-color:#F2F2F2; +z-index:1; +height:20px; +padding:0px; +margin:0px; +padding-left:10px; +padding-top:2px; +} + +.breadcrumb ul{ + margin:0px; + padding:0px; +} + +.breadcrumb ul li{ +background-color:#F2F2F2; +list-style-type:none; +padding:0; +margin:0; +height:20px; +} + +.breadcrumb li{ +float:left; +} + +.breadcrumb .first { +background:url(../images/home.png); +background-position:left; +background-repeat:no-repeat; +padding-left:20px; +} + + +.breadcrumb li a{ +color:#2C418D; +display:block; +text-decoration:none; +background:url(../images/arrow.png); +background-repeat:no-repeat; +background-position:right; +padding-right:25px; +padding-left:10px; +} + +.breadcrumb li a:hover{ +color:#909090; +display:block; +text-decoration:none; +background:url(../images/arrow.png); +background-repeat:no-repeat; +background-position:right; +padding-right:20px; +padding-left:10px; +} + + +/* table of content +no display +*/ + +/* +----------- +headers +----------- +*/ + + +@media screen{ +.title{ +color:#313131; +font-size: 18px; +font-weight: normal; +left: 0; +padding-bottom: 20px; +padding-left: 10px; +padding-top: 20px; +position: absolute; +right: 0; +top: 0; +background-color:#E6E6E6; +border-bottom: 1px #CCC solid; +border-top: 2px #CCC solid; +font-weight:bold; +margin-left:5px; +margin-right:5px; +} +} + +h1 { +margin: 0; +} + +h2, p.h2 { +font: 500 16px/1.2 Arial; +font-weight:100; +background-color:#F2F3F4; +padding:4px; +margin-bottom:30px; +margin-top:30px; +border-top:#E0E0DE 1px solid; +border-bottom: #E0E0DE 1px solid; +max-width: 99%; +} + +h3{ + +font: 500 14px/1.2 Arial; +font-weight:100; +text-decoration:underline; +margin-bottom:30px; +margin-top:30px; +} + +h3.fn,span.fn{ +border-width: 1px; +border-style: solid; +border-color: #E6E6E6; +-moz-border-radius: 7px 7px 7px 7px; +-webkit-border-radius: 7px 7px 7px 7px; +border-radius: 7px 7px 7px 7px; +background-color: #F6F6F6; +word-spacing: 3px; +padding: 5px 5px; +text-decoration:none; +font-weight:bold; +max-width:75%; +font-size:14px; +margin:0px; +margin-top:30px; + +} + +.name{ +color:#1A1A1A; +} +.type{ +color:#808080; +} + + + +@media print { +.title { +color:#0066CB; +font-family:Arial, Helvetica; +font-size: 32px; +font-weight: normal; +left: 0; +position: absolute; +right: 0; +top: 0; +} +} + + +/* +----------------- +table styles +----------------- +*/ +.table img { +border:none; +margin-left:0px; +-moz-box-shadow:0px 0px 0px #fff; +-webkit-box-shadow: 0px 0px 0px #fff; +box-shadow: 0px 0px 0px #fff; +} + +/* table with border alternative colours*/ + + table,pre{ +-moz-border-radius: 7px 7px 7px 7px; +-webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; +background-color: #F6F6F6; +border: 1px solid #E6E6E6; +border-collapse: separate; +font-size: 12px; +line-height: 1.2; +margin-bottom: 25px; +margin-left: 15px; +font-size: 12px; +line-height: 1.2; +margin-bottom: 25px; +margin-left: 15px; +} + + +table th{ +text-align:left; +padding-left:20px; +} + +table td { +padding: 3px 15px 3px 20px; +border-bottom:#CCC dotted 1px; +} +table p { margin:0px;} + +table tr.even { +background-color: white; +color: #66666E; +} + +table tr.odd { +background-color: #F6F6F6; +color: #66666E; +} + + +table thead { +text-align:left; +padding-left:20px; +background-color:#e1e0e0; +border-left:none; +border-right:none; +} + +table thead th { +padding-top:5px; +padding-left:10px; +padding-bottom:5px; +border-bottom: 2px solid #D1D1D1; +padding-right:10px; +} + + +/* table bodless & white*/ + +.borderless { +border-radius: 0px 0px 0px 0px; +background-color: #fff; +border: 1px solid #fff; +} + +.borderless tr { +background-color: #FFF; +color: #66666E; +} + +.borderless td { +border:none; +border-bottom:#fff dotted 1px; +} + +/* +----------- +List +----------- +*/ + +ul{ +padding-bottom:2px; +} + +li { +margin-bottom: 10px; +padding-left: 8px; +list-style:outside; +list-style-type:square; +text-align:left; +} + + +ol{ +margin:10px; +padding:0; +} + +ol > li{ +margin-left: 30px; +padding-left:8px; +list-style:decimal; +} + +.centerAlign{ +text-align: left; +} + +.cpp{ +display: block; +margin: 10; +overflow: hidden; +overflow-x: hidden; +overflow-y: hidden; +padding: 20px 0 20px 0; +} + +.footer{ +margin-top: 50px; +padding-left:5px; +margin-bottom: 10px; +font-size:10px; +border-top: 1px solid #999; +padding-top:11px; +} + +.footerNavi{ +width:auto; +text-align:right; +margin-top:50px; +z-index:1; +} + +.memItemLeft{ +padding-right: 3px; +} + +.memItemRight{ +padding: 3px 15px 3px 0; +} + +.qml{ +display: block; +margin: 10; +overflow: hidden; +overflow-x: hidden; +overflow-y: hidden; +padding: 20px 0 20px 0; +} + +.qmldefault{ +padding-left: 5px; +float: right; +color: red; +} + +.qmlreadonly{ +padding-left: 5px; +float: right; +color: #254117; +} + +.rightAlign{ +padding: 3px 5px 3px 10px; +text-align: right; +} + +/* +----------- +Content table +----------- +*/ + +@media print{ +.toc { +float: right; +padding-bottom: 10px; +padding-top: 50px; +width: 100%; +background-image:url(../images/bgrContent.png); +background-position:top; +background-repeat:no-repeat; +} +} + +@media screen{ +.toc{ +clear:both; +float:right; +vertical-align:top; +-moz-border-radius: 7px 7px 7px 7px; +-webkit-border-radius: 7px 7px 7px 7px; +border-radius: 7px 7px 7px 7px; + background:#FFF url(../images/bgrContent.png); +background-position:top; +background-repeat:repeat-x; +border: 1px solid #E6E6E6; +padding-left:5px; +padding-bottom:10px; +height: auto; +width: 200px; +text-align:left; +z-index:2; +margin-left:20px; +margin-right:20px; +margin-top:0px; +padding-top:0px; +} +} + +.toc h3{ +text-decoration:none; +} + +.toc h3{font: 500 14px/1.2 Arial; +font-weight:100; +padding:0px; +margin:0px; +padding-top:5px; +padding-left:5px; +} + + +.toc ul{ +width:160px; +padding-left:10px; +padding-right:5px; +padding-bottom:10px; +padding-top:10px; +} + +.toc ul li{ +margin-left:20px; +list-style-image:url(../images/blu_dot.png); +list-style:outside; + +} + + +.toc ul li a:link{ +color: #2C418D; +text-decoration: none; +} + +.toc ul li a:hover{ +color: #869CD1; +text-decoration:underline; + +} + +.toc ul li a:visited{ +color: #869CD1; +font-weight: bold; +} + +.level1{ +border:none;} + +.clearfix{ +clear:both;} + diff --git a/tools/qdoc3/test/qt-html-default-styles.qdocconf b/tools/qdoc3/test/qt-html-default-styles.qdocconf index 0db36bc..31fa9b9 100644 --- a/tools/qdoc3/test/qt-html-default-styles.qdocconf +++ b/tools/qdoc3/test/qt-html-default-styles.qdocconf @@ -13,13 +13,22 @@ HTML.scripts = # directory prefixes. extraimages.HTML = qt-logo.png \ + arrow.png \ arrow_down.png \ + bgrContent.png \ breadcrumb.png \ + blu_dot.png \ + btn_next.png \ + btn_prev.png \ bullet_gt.png \ bullet_dn.png \ bullet_sq.png \ bullet_up.png \ + home.png \ horBar.png \ + ico_note.png \ + ico_note_attention.png \ + ico_out.png \ sprites-combined.png # Include the style sheets and scripts used. diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 4f0cb1f..69d00e9 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -43,13 +43,22 @@ HTML.footer = \ # Files not referenced in any qdoc file. # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ + images/arrow.png \ images/arrow_down.png \ + images/bgrContent.png \ + images/blu_dot.png \ + images/btn_next.png \ + images/btn_prev.png \ images/breadcrumb.png \ images/bullet_gt.png \ images/bullet_dn.png \ images/bullet_sq.png \ images/bullet_up.png \ + images/home.png \ images/horBar.png \ + images/ico_note.png \ + images/ico_note_attention.png \ + images/ico_out.png \ images/sprites-combined.png \ style/offline.css -- cgit v0.12 From 5a669718e9cc0b22eb420eb77dd684e63158a398 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Thu, 22 Dec 2011 15:39:01 +0100 Subject: Revert variable overwritten by copying from Qt5 Reviewed-by: Trust me --- tools/qdoc3/test/qt-html-default-styles.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qdoc3/test/qt-html-default-styles.qdocconf b/tools/qdoc3/test/qt-html-default-styles.qdocconf index b8d95e5..31fa9b9 100644 --- a/tools/qdoc3/test/qt-html-default-styles.qdocconf +++ b/tools/qdoc3/test/qt-html-default-styles.qdocconf @@ -2,7 +2,7 @@ # specified relative to the template directory and will be copied into # subdirectories of the output directory. -HTML.templatedir = $MODULE_SOURCE_TREE/doc/src/template +HTML.templatedir = $QT_SOURCE_TREE/doc/src/template HTML.stylesheets = style/offline.css -- cgit v0.12 From 45335cba963c41ab73d471ee1c18e37dd6b2a5b8 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 25 Oct 2011 11:26:19 +1000 Subject: tests: eliminated usage of qttest_p4.prf qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: If1f16810614f7965dc7d5bf680effed911bee114 Reviewed-by: Jason McDonald --- tests/auto/collections/collections.pro | 5 +++-- tests/auto/compiler/compiler.pro | 5 +++-- tests/auto/exceptionsafety/exceptionsafety.pro | 5 +++-- tests/auto/macplist/app/app.pro | 4 ---- tests/auto/macplist/test/test.pro | 3 ++- tests/auto/q_func_info/q_func_info.pro | 5 +++-- tests/auto/qabstractfileengine/qabstractfileengine.pro | 5 +++-- tests/auto/qanimationgroup/qanimationgroup.pro | 5 +++-- tests/auto/qatomicint/qatomicint.pro | 5 +++-- tests/auto/qatomicpointer/qatomicpointer.pro | 5 +++-- tests/auto/qbitarray/qbitarray.pro | 5 +++-- tests/auto/qbuffer/qbuffer.pro | 5 +++-- tests/auto/qbytearraymatcher/qbytearraymatcher.pro | 5 +++-- tests/auto/qcache/qcache.pro | 5 +++-- tests/auto/qcolor/qcolor.pro | 7 +++---- tests/auto/qcoreapplication/qcoreapplication.pro | 5 +++-- tests/auto/qdate/qdate.pro | 5 +++-- tests/auto/qdbusabstractinterface/test/test.pro | 4 ++-- tests/auto/qdbustype/qdbustype.pro | 5 +++-- tests/auto/qdebug/qdebug.pro | 5 +++-- .../auto/qdirectpainter/runDirectPainter/runDirectPainter.pro | 3 ++- tests/auto/qeasingcurve/qeasingcurve.pro | 5 +++-- tests/auto/qevent/qevent.pro | 5 +++-- .../qexplicitlyshareddatapointer.pro | 5 +++-- tests/auto/qflags/qflags.pro | 5 +++-- tests/auto/qfontmetrics/qfontmetrics.pro | 4 +++- tests/auto/qgetputenv/qgetputenv.pro | 5 +++-- tests/auto/qglobal/qglobal.pro | 5 +++-- tests/auto/qguivariant/qguivariant.pro | 6 +++--- tests/auto/qimageiohandler/qimageiohandler.pro | 8 +++----- tests/auto/qintvalidator/qintvalidator.pro | 6 +++--- tests/auto/qmake/qmake.pro | 5 +++-- tests/auto/qmap/qmap.pro | 6 +++--- tests/auto/qmargins/qmargins.pro | 5 +++-- tests/auto/qmath/qmath.pro | 6 +++--- tests/auto/qmatrixnxn/qmatrixnxn.pro | 4 +++- tests/auto/qmetatype/qmetatype.pro | 5 +++-- tests/auto/qmimedata/qmimedata.pro | 5 +++-- tests/auto/qmutex/qmutex.pro | 5 +++-- tests/auto/qmutexlocker/qmutexlocker.pro | 5 +++-- tests/auto/qnumeric/qnumeric.pro | 6 +++--- tests/auto/qobjectperformance/qobjectperformance.pro | 5 +++-- tests/auto/qobjectrace/qobjectrace.pro | 4 ++-- tests/auto/qpaintengine/qpaintengine.pro | 11 +++-------- tests/auto/qpainterpath/qpainterpath.pro | 7 +++---- tests/auto/qpainterpathstroker/qpainterpathstroker.pro | 7 +++---- .../auto/qparallelanimationgroup/qparallelanimationgroup.pro | 5 +++-- tests/auto/qpen/qpen.pro | 7 +++---- tests/auto/qpoint/qpoint.pro | 5 +++-- tests/auto/qprocessenvironment/qprocessenvironment.pro | 5 +++-- tests/auto/qquaternion/qquaternion.pro | 4 +++- tests/auto/qqueue/qqueue.pro | 6 +++--- tests/auto/qrand/qrand.pro | 5 +++-- tests/auto/qreadlocker/qreadlocker.pro | 5 +++-- tests/auto/qreadwritelock/qreadwritelock.pro | 5 +++-- tests/auto/qrect/qrect.pro | 5 +++-- tests/auto/qregexp/qregexp.pro | 8 +++----- tests/auto/qregexpvalidator/qregexpvalidator.pro | 6 +++--- tests/auto/qscopedpointer/qscopedpointer.pro | 5 +++-- tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro | 5 +++-- .../qsequentialanimationgroup/qsequentialanimationgroup.pro | 5 +++-- tests/auto/qsignalspy/qsignalspy.pro | 5 +++-- tests/auto/qsize/qsize.pro | 5 +++-- tests/auto/qsizef/qsizef.pro | 5 +++-- .../qsslsocket_onDemandCertificates_member.pro | 6 +++--- .../qsslsocket_onDemandCertificates_static.pro | 6 +++--- tests/auto/qstate/qstate.pro | 5 +++-- tests/auto/qstl/qstl.pro | 5 +++-- tests/auto/qstringbuilder1/qstringbuilder1.pro | 5 +++-- tests/auto/qstringbuilder2/qstringbuilder2.pro | 5 +++-- tests/auto/qstringbuilder3/qstringbuilder3.pro | 5 +++-- tests/auto/qstringbuilder4/qstringbuilder4.pro | 5 +++-- tests/auto/qstringlist/qstringlist.pro | 5 +++-- tests/auto/qstringmatcher/qstringmatcher.pro | 5 +++-- tests/auto/qstringref/qstringref.pro | 5 +++-- tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro | 6 +++--- tests/auto/qtextcursor/qtextcursor.pro | 7 +++---- tests/auto/qtextformat/qtextformat.pro | 11 +++-------- tests/auto/qthreadonce/qthreadonce.pro | 5 +++-- tests/auto/qthreadpool/qthreadpool.pro | 5 +++-- tests/auto/qthreadstorage/tst_qthreadstorage.pro | 7 ++++--- tests/auto/qtime/qtime.pro | 5 +++-- tests/auto/qtimeline/qtimeline.pro | 6 +++--- tests/auto/qtimer/qtimer.pro | 6 +++--- tests/auto/qtokenautomaton/qtokenautomaton.pro | 5 +++-- tests/auto/qtransformedscreen/qtransformedscreen.pro | 4 +++- tests/auto/qurl/qurl.pro | 7 ++++--- tests/auto/qvarlengtharray/qvarlengtharray.pro | 6 +++--- tests/auto/qvector/qvector.pro | 5 +++-- tests/auto/qvectornd/qvectornd.pro | 4 +++- tests/auto/qwaitcondition/qwaitcondition.pro | 5 +++-- tests/auto/qwindowsurface/qwindowsurface.pro | 8 +++++--- tests/auto/qwritelocker/qwritelocker.pro | 5 +++-- tests/auto/qwsembedwidget/qwsembedwidget.pro | 4 +++- tests/auto/qwsinputmethod/qwsinputmethod.pro | 4 +++- tests/auto/qwswindowsystem/qwswindowsystem.pro | 4 +++- tests/auto/qx11info/qx11info.pro | 6 +++--- tests/auto/qxmlinputsource/qxmlinputsource.pro | 5 +++-- tests/auto/utf8/utf8.pro | 5 +++-- .../network_remote_stresstest/network_remote_stresstest.pro | 5 +++-- tests/manual/network_stresstest/network_stresstest.pro | 5 +++-- .../manual/qhttpnetworkconnection/qhttpnetworkconnection.pro | 4 ++-- tests/manual/qnetworkreply/qnetworkreply.pro | 4 ++-- tests/manual/qssloptions/qssloptions.pro | 4 ++-- tests/manual/socketengine/socketengine.pro | 4 ++-- 105 files changed, 308 insertions(+), 247 deletions(-) diff --git a/tests/auto/collections/collections.pro b/tests/auto/collections/collections.pro index 8601ff8..364ae21 100644 --- a/tests/auto/collections/collections.pro +++ b/tests/auto/collections/collections.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_collections SOURCES += tst_collections.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/compiler/compiler.pro b/tests/auto/compiler/compiler.pro index c444c63..e6307ac 100644 --- a/tests/auto/compiler/compiler.pro +++ b/tests/auto/compiler/compiler.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_compiler SOURCES += tst_compiler.cpp baseclass.cpp derivedclass.cpp HEADERS += baseclass.h derivedclass.h -QT = core +QT = core testlib diff --git a/tests/auto/exceptionsafety/exceptionsafety.pro b/tests/auto/exceptionsafety/exceptionsafety.pro index 52ba9e2..66abe49 100644 --- a/tests/auto/exceptionsafety/exceptionsafety.pro +++ b/tests/auto/exceptionsafety/exceptionsafety.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_exceptionsafety SOURCES += tst_exceptionsafety.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/macplist/app/app.pro b/tests/auto/macplist/app/app.pro index c1cf52e..6a976cb 100644 --- a/tests/auto/macplist/app/app.pro +++ b/tests/auto/macplist/app/app.pro @@ -1,7 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Jan 7 13:01:11 2009 -###################################################################### - TEMPLATE = app TARGET = DEPENDPATH += . diff --git a/tests/auto/macplist/test/test.pro b/tests/auto/macplist/test/test.pro index 4751b47..5018abe 100644 --- a/tests/auto/macplist/test/test.pro +++ b/tests/auto/macplist/test/test.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +QT += testlib SOURCES += ../tst_macplist.cpp TARGET = ../tst_macplist win32 { diff --git a/tests/auto/q_func_info/q_func_info.pro b/tests/auto/q_func_info/q_func_info.pro index 64f08d4..d657fd8 100644 --- a/tests/auto/q_func_info/q_func_info.pro +++ b/tests/auto/q_func_info/q_func_info.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_q_func_info SOURCES += tst_q_func_info.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qabstractfileengine/qabstractfileengine.pro b/tests/auto/qabstractfileengine/qabstractfileengine.pro index 870473a..d498b53 100644 --- a/tests/auto/qabstractfileengine/qabstractfileengine.pro +++ b/tests/auto/qabstractfileengine/qabstractfileengine.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qabstractfileengine +QT = core testlib SOURCES = tst_qabstractfileengine.cpp RESOURCES += qabstractfileengine.qrc diff --git a/tests/auto/qanimationgroup/qanimationgroup.pro b/tests/auto/qanimationgroup/qanimationgroup.pro index 5e1be0c..179412a 100644 --- a/tests/auto/qanimationgroup/qanimationgroup.pro +++ b/tests/auto/qanimationgroup/qanimationgroup.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qanimationgroup +QT = core testlib SOURCES += tst_qanimationgroup.cpp diff --git a/tests/auto/qatomicint/qatomicint.pro b/tests/auto/qatomicint/qatomicint.pro index 7850d93..dd18c7d 100644 --- a/tests/auto/qatomicint/qatomicint.pro +++ b/tests/auto/qatomicint/qatomicint.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qatomicint SOURCES += tst_qatomicint.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qatomicpointer/qatomicpointer.pro b/tests/auto/qatomicpointer/qatomicpointer.pro index 89ff137..dc6c54a 100644 --- a/tests/auto/qatomicpointer/qatomicpointer.pro +++ b/tests/auto/qatomicpointer/qatomicpointer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qatomicpointer SOURCES += tst_qatomicpointer.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qbitarray/qbitarray.pro b/tests/auto/qbitarray/qbitarray.pro index 358d81b..528ea58 100644 --- a/tests/auto/qbitarray/qbitarray.pro +++ b/tests/auto/qbitarray/qbitarray.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qbitarray SOURCES += tst_qbitarray.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qbuffer/qbuffer.pro b/tests/auto/qbuffer/qbuffer.pro index b768eb8..9745fcd 100644 --- a/tests/auto/qbuffer/qbuffer.pro +++ b/tests/auto/qbuffer/qbuffer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qbuffer SOURCES += tst_qbuffer.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro index a2458e6..a90511d 100644 --- a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro +++ b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qbytearraymatcher SOURCES += tst_qbytearraymatcher.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qcache/qcache.pro b/tests/auto/qcache/qcache.pro index 0da4e14..bd2a683 100644 --- a/tests/auto/qcache/qcache.pro +++ b/tests/auto/qcache/qcache.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcache SOURCES += tst_qcache.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qcolor/qcolor.pro b/tests/auto/qcolor/qcolor.pro index b9d437e..7dba0ce 100644 --- a/tests/auto/qcolor/qcolor.pro +++ b/tests/auto/qcolor/qcolor.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcolor SOURCES += tst_qcolor.cpp - - - +QT += testlib diff --git a/tests/auto/qcoreapplication/qcoreapplication.pro b/tests/auto/qcoreapplication/qcoreapplication.pro index 031af39..33ac65d 100644 --- a/tests/auto/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/qcoreapplication/qcoreapplication.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcoreapplication SOURCES += tst_qcoreapplication.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qdate/qdate.pro b/tests/auto/qdate/qdate.pro index 1c04100..749c65e 100644 --- a/tests/auto/qdate/qdate.pro +++ b/tests/auto/qdate/qdate.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdate SOURCES += tst_qdate.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qdbusabstractinterface/test/test.pro b/tests/auto/qdbusabstractinterface/test/test.pro index 98bcaa7..aba7f57 100644 --- a/tests/auto/qdbusabstractinterface/test/test.pro +++ b/tests/auto/qdbusabstractinterface/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusabstractinterface.cpp ../interface.cpp HEADERS += ../interface.h @@ -9,5 +9,5 @@ HEADERS += ../pinger.h TARGET = ../tst_qdbusabstractinterface -QT = core +QT = core testlib QT += dbus diff --git a/tests/auto/qdbustype/qdbustype.pro b/tests/auto/qdbustype/qdbustype.pro index e2f0c90..159b531 100644 --- a/tests/auto/qdbustype/qdbustype.pro +++ b/tests/auto/qdbustype/qdbustype.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qdbustype +QT = core testlib contains(QT_CONFIG,dbus): { SOURCES += tst_qdbustype.cpp QT += dbus diff --git a/tests/auto/qdebug/qdebug.pro b/tests/auto/qdebug/qdebug.pro index 2b57168..b6a91a7 100644 --- a/tests/auto/qdebug/qdebug.pro +++ b/tests/auto/qdebug/qdebug.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdebug SOURCES += tst_qdebug.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro index 09524e9..5b70dc6 100644 --- a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro +++ b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +QT += testlib SOURCES = main.cpp TARGET = runDirectPainter diff --git a/tests/auto/qeasingcurve/qeasingcurve.pro b/tests/auto/qeasingcurve/qeasingcurve.pro index 2a3a075..03d71bb 100644 --- a/tests/auto/qeasingcurve/qeasingcurve.pro +++ b/tests/auto/qeasingcurve/qeasingcurve.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qeasingcurve +QT = core testlib SOURCES += tst_qeasingcurve.cpp CONFIG += parallel_test diff --git a/tests/auto/qevent/qevent.pro b/tests/auto/qevent/qevent.pro index 6042b6c..09d4395 100644 --- a/tests/auto/qevent/qevent.pro +++ b/tests/auto/qevent/qevent.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qevent SOURCES += tst_qevent.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro index cf574ff..9064d02 100644 --- a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro +++ b/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qexplicitlyshareddatapointer SOURCES += tst_qexplicitlyshareddatapointer.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qflags/qflags.pro b/tests/auto/qflags/qflags.pro index 097a218..eeb204f 100644 --- a/tests/auto/qflags/qflags.pro +++ b/tests/auto/qflags/qflags.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qflags SOURCES += tst_qflags.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qfontmetrics/qfontmetrics.pro b/tests/auto/qfontmetrics/qfontmetrics.pro index c0dc1ab..a636651 100644 --- a/tests/auto/qfontmetrics/qfontmetrics.pro +++ b/tests/auto/qfontmetrics/qfontmetrics.pro @@ -1,4 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfontmetrics +QT += testlib SOURCES += tst_qfontmetrics.cpp RESOURCES += testfont.qrc diff --git a/tests/auto/qgetputenv/qgetputenv.pro b/tests/auto/qgetputenv/qgetputenv.pro index df94f14..ccfac7b 100644 --- a/tests/auto/qgetputenv/qgetputenv.pro +++ b/tests/auto/qgetputenv/qgetputenv.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qgetputenv SOURCES += tst_qgetputenv.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qglobal/qglobal.pro b/tests/auto/qglobal/qglobal.pro index a4dffac..b4bcf05 100644 --- a/tests/auto/qglobal/qglobal.pro +++ b/tests/auto/qglobal/qglobal.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qglobal SOURCES += tst_qglobal.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qguivariant/qguivariant.pro b/tests/auto/qguivariant/qguivariant.pro index 68082f0..9653d8e 100644 --- a/tests/auto/qguivariant/qguivariant.pro +++ b/tests/auto/qguivariant/qguivariant.pro @@ -1,5 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qguivariant SOURCES += tst_qguivariant.cpp - - +QT += testlib diff --git a/tests/auto/qimageiohandler/qimageiohandler.pro b/tests/auto/qimageiohandler/qimageiohandler.pro index 46e5cfb..428ff62 100644 --- a/tests/auto/qimageiohandler/qimageiohandler.pro +++ b/tests/auto/qimageiohandler/qimageiohandler.pro @@ -1,8 +1,6 @@ -############################################################ -# Project file for autotest for file qimageiohandler.h -############################################################ - -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qimageiohandler +QT += testlib SOURCES += tst_qimageiohandler.cpp diff --git a/tests/auto/qintvalidator/qintvalidator.pro b/tests/auto/qintvalidator/qintvalidator.pro index 576621a..52e0b85 100644 --- a/tests/auto/qintvalidator/qintvalidator.pro +++ b/tests/auto/qintvalidator/qintvalidator.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qintvalidator SOURCES += tst_qintvalidator.cpp - - +QT += testlib diff --git a/tests/auto/qmake/qmake.pro b/tests/auto/qmake/qmake.pro index d0faa87..e78da4c 100644 --- a/tests/auto/qmake/qmake.pro +++ b/tests/auto/qmake/qmake.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmake HEADERS += testcompiler.h SOURCES += tst_qmake.cpp testcompiler.cpp -QT -= gui +QT = core testlib cross_compile: DEFINES += QMAKE_CROSS_COMPILED diff --git a/tests/auto/qmap/qmap.pro b/tests/auto/qmap/qmap.pro index eaed926..fc4c84c 100644 --- a/tests/auto/qmap/qmap.pro +++ b/tests/auto/qmap/qmap.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmap -QT = core +QT = core testlib SOURCES += tst_qmap.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/qmargins/qmargins.pro b/tests/auto/qmargins/qmargins.pro index 0404da0..02478c3 100644 --- a/tests/auto/qmargins/qmargins.pro +++ b/tests/auto/qmargins/qmargins.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmargins SOURCES += tst_qmargins.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qmath/qmath.pro b/tests/auto/qmath/qmath.pro index e5784ce..90e61d7 100644 --- a/tests/auto/qmath/qmath.pro +++ b/tests/auto/qmath/qmath.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmath -QT = core +QT = core testlib SOURCES += tst_qmath.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/qmatrixnxn/qmatrixnxn.pro b/tests/auto/qmatrixnxn/qmatrixnxn.pro index cf6e4a1..9c43d60 100644 --- a/tests/auto/qmatrixnxn/qmatrixnxn.pro +++ b/tests/auto/qmatrixnxn/qmatrixnxn.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmatrixnxn SOURCES += tst_qmatrixnxn.cpp +QT += testlib diff --git a/tests/auto/qmetatype/qmetatype.pro b/tests/auto/qmetatype/qmetatype.pro index ed1de83..2841c5f 100644 --- a/tests/auto/qmetatype/qmetatype.pro +++ b/tests/auto/qmetatype/qmetatype.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmetatype SOURCES += tst_qmetatype.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qmimedata/qmimedata.pro b/tests/auto/qmimedata/qmimedata.pro index 13fbe65..e4cf4ce 100644 --- a/tests/auto/qmimedata/qmimedata.pro +++ b/tests/auto/qmimedata/qmimedata.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmimedata SOURCES += tst_qmimedata.cpp - +QT += testlib diff --git a/tests/auto/qmutex/qmutex.pro b/tests/auto/qmutex/qmutex.pro index 760dcfd..cf567c2 100644 --- a/tests/auto/qmutex/qmutex.pro +++ b/tests/auto/qmutex/qmutex.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmutex SOURCES += tst_qmutex.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qmutexlocker/qmutexlocker.pro b/tests/auto/qmutexlocker/qmutexlocker.pro index 01c3691..9e44b5f 100644 --- a/tests/auto/qmutexlocker/qmutexlocker.pro +++ b/tests/auto/qmutexlocker/qmutexlocker.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmutexlocker SOURCES += tst_qmutexlocker.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qnumeric/qnumeric.pro b/tests/auto/qnumeric/qnumeric.pro index c0af962..67b7a8d 100644 --- a/tests/auto/qnumeric/qnumeric.pro +++ b/tests/auto/qnumeric/qnumeric.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnumeric -QT = core +QT = core testlib SOURCES += tst_qnumeric.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/qobjectperformance/qobjectperformance.pro b/tests/auto/qobjectperformance/qobjectperformance.pro index 0b4c5ee..189f8ee 100644 --- a/tests/auto/qobjectperformance/qobjectperformance.pro +++ b/tests/auto/qobjectperformance/qobjectperformance.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qobjectperformance SOURCES += tst_qobjectperformance.cpp -QT = core network +QT = core network testlib diff --git a/tests/auto/qobjectrace/qobjectrace.pro b/tests/auto/qobjectrace/qobjectrace.pro index 526875b..9a0d8e5 100644 --- a/tests/auto/qobjectrace/qobjectrace.pro +++ b/tests/auto/qobjectrace/qobjectrace.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qobjectrace.cpp -QT = core +QT = core testlib TARGET.EPOCHEAPSIZE = 20000000 40000000 CONFIG += parallel_test diff --git a/tests/auto/qpaintengine/qpaintengine.pro b/tests/auto/qpaintengine/qpaintengine.pro index e37c166..810dd81 100644 --- a/tests/auto/qpaintengine/qpaintengine.pro +++ b/tests/auto/qpaintengine/qpaintengine.pro @@ -1,9 +1,4 @@ -############################################################ -# Project file for autotest for file qpaintengine.h -############################################################ - -load(qttest_p4) - +CONFIG += testcase +TARGET = tst_qpaintengine SOURCES += tst_qpaintengine.cpp - - +QT += testlib diff --git a/tests/auto/qpainterpath/qpainterpath.pro b/tests/auto/qpainterpath/qpainterpath.pro index 9708222..0c0fe89 100644 --- a/tests/auto/qpainterpath/qpainterpath.pro +++ b/tests/auto/qpainterpath/qpainterpath.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpainterpath SOURCES += tst_qpainterpath.cpp - - - +QT += testlib diff --git a/tests/auto/qpainterpathstroker/qpainterpathstroker.pro b/tests/auto/qpainterpathstroker/qpainterpathstroker.pro index b6f62a2..218183d 100644 --- a/tests/auto/qpainterpathstroker/qpainterpathstroker.pro +++ b/tests/auto/qpainterpathstroker/qpainterpathstroker.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpainterpathstroker SOURCES += tst_qpainterpathstroker.cpp - - - +QT += testlib diff --git a/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro b/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro index f2cacd3..e18d17b 100644 --- a/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro +++ b/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core gui +CONFIG += testcase +TARGET = tst_qparallelanimationgroup +QT = core gui testlib SOURCES += tst_qparallelanimationgroup.cpp diff --git a/tests/auto/qpen/qpen.pro b/tests/auto/qpen/qpen.pro index 53bd5e2..762b8f4 100644 --- a/tests/auto/qpen/qpen.pro +++ b/tests/auto/qpen/qpen.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpen SOURCES += tst_qpen.cpp - - - +QT += testlib diff --git a/tests/auto/qpoint/qpoint.pro b/tests/auto/qpoint/qpoint.pro index fd24046..cd501f6 100644 --- a/tests/auto/qpoint/qpoint.pro +++ b/tests/auto/qpoint/qpoint.pro @@ -2,7 +2,8 @@ # Project file for autotest for file qpoint.h ############################################################ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpoint SOURCES += tst_qpoint.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qprocessenvironment/qprocessenvironment.pro b/tests/auto/qprocessenvironment/qprocessenvironment.pro index 60dba50..b05b8a5 100644 --- a/tests/auto/qprocessenvironment/qprocessenvironment.pro +++ b/tests/auto/qprocessenvironment/qprocessenvironment.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qprocessenvironment -QT = core +QT = core testlib SOURCES += tst_qprocessenvironment.cpp CONFIG += parallel_test diff --git a/tests/auto/qquaternion/qquaternion.pro b/tests/auto/qquaternion/qquaternion.pro index 6f740cf..f578a38 100644 --- a/tests/auto/qquaternion/qquaternion.pro +++ b/tests/auto/qquaternion/qquaternion.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qquaternion SOURCES += tst_qquaternion.cpp +QT += testlib diff --git a/tests/auto/qqueue/qqueue.pro b/tests/auto/qqueue/qqueue.pro index ce0d8c3..4a515d7 100644 --- a/tests/auto/qqueue/qqueue.pro +++ b/tests/auto/qqueue/qqueue.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qqueue -QT = core +QT = core testlib SOURCES += tst_qqueue.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/qrand/qrand.pro b/tests/auto/qrand/qrand.pro index 0db8af8..552592e 100644 --- a/tests/auto/qrand/qrand.pro +++ b/tests/auto/qrand/qrand.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qrand SOURCES += tst_qrand.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qreadlocker/qreadlocker.pro b/tests/auto/qreadlocker/qreadlocker.pro index ee53307..13cdf0c 100644 --- a/tests/auto/qreadlocker/qreadlocker.pro +++ b/tests/auto/qreadlocker/qreadlocker.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qreadlocker SOURCES += tst_qreadlocker.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qreadwritelock/qreadwritelock.pro b/tests/auto/qreadwritelock/qreadwritelock.pro index 93f7c68..c35023d 100644 --- a/tests/auto/qreadwritelock/qreadwritelock.pro +++ b/tests/auto/qreadwritelock/qreadwritelock.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qreadwritelock SOURCES += tst_qreadwritelock.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qrect/qrect.pro b/tests/auto/qrect/qrect.pro index f1ad046e..149d194 100644 --- a/tests/auto/qrect/qrect.pro +++ b/tests/auto/qrect/qrect.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qrect SOURCES += tst_qrect.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qregexp/qregexp.pro b/tests/auto/qregexp/qregexp.pro index e0fef12..9630235 100644 --- a/tests/auto/qregexp/qregexp.pro +++ b/tests/auto/qregexp/qregexp.pro @@ -1,9 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qregexp -QT = core - - -QT = core +QT = core testlib SOURCES += tst_qregexp.cpp CONFIG += parallel_test diff --git a/tests/auto/qregexpvalidator/qregexpvalidator.pro b/tests/auto/qregexpvalidator/qregexpvalidator.pro index 68e5c51..8f1de5b 100644 --- a/tests/auto/qregexpvalidator/qregexpvalidator.pro +++ b/tests/auto/qregexpvalidator/qregexpvalidator.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qregexpvalidator SOURCES += tst_qregexpvalidator.cpp - - +QT += testlib diff --git a/tests/auto/qscopedpointer/qscopedpointer.pro b/tests/auto/qscopedpointer/qscopedpointer.pro index 4a3d5b8d..1aa5e33 100644 --- a/tests/auto/qscopedpointer/qscopedpointer.pro +++ b/tests/auto/qscopedpointer/qscopedpointer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qscopedpointer SOURCES += tst_qscopedpointer.cpp -QT -= gui +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro index f06e21b..85aab77 100644 --- a/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro +++ b/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qscopedvaluerollback SOURCES += tst_qscopedvaluerollback.cpp -QT -= gui +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro b/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro index c0c10c0..810e0a7 100644 --- a/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro +++ b/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qsequentialanimationgroup +QT = core testlib SOURCES += tst_qsequentialanimationgroup.cpp diff --git a/tests/auto/qsignalspy/qsignalspy.pro b/tests/auto/qsignalspy/qsignalspy.pro index d3ae63b..72ae3a5 100644 --- a/tests/auto/qsignalspy/qsignalspy.pro +++ b/tests/auto/qsignalspy/qsignalspy.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsignalspy SOURCES += tst_qsignalspy.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qsize/qsize.pro b/tests/auto/qsize/qsize.pro index a1814ac..140205b 100644 --- a/tests/auto/qsize/qsize.pro +++ b/tests/auto/qsize/qsize.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsize SOURCES += tst_qsize.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qsizef/qsizef.pro b/tests/auto/qsizef/qsizef.pro index 5aa07d7..e0e9b0d 100644 --- a/tests/auto/qsizef/qsizef.pro +++ b/tests/auto/qsizef/qsizef.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsizef SOURCES += tst_qsizef.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index 53020eb..0c26ee5 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += network testlib QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_member @@ -10,7 +10,7 @@ TARGET = tst_qsslsocket_onDemandCertificates_member win32 { CONFIG(debug, debug|release) { DESTDIR = debug -} else { + } else { DESTDIR = release } } diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index 3452a92..d4e7602 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += network testlib QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_static @@ -10,7 +10,7 @@ TARGET = tst_qsslsocket_onDemandCertificates_static win32 { CONFIG(debug, debug|release) { DESTDIR = debug -} else { + } else { DESTDIR = release } } diff --git a/tests/auto/qstate/qstate.pro b/tests/auto/qstate/qstate.pro index 6ee7e0c..243a696 100644 --- a/tests/auto/qstate/qstate.pro +++ b/tests/auto/qstate/qstate.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qstate +QT = core testlib SOURCES += tst_qstate.cpp diff --git a/tests/auto/qstl/qstl.pro b/tests/auto/qstl/qstl.pro index a0c9db1..128ee56 100644 --- a/tests/auto/qstl/qstl.pro +++ b/tests/auto/qstl/qstl.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstl SOURCES += tst_qstl.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qstringbuilder1/qstringbuilder1.pro b/tests/auto/qstringbuilder1/qstringbuilder1.pro index dc9062f..1888450 100644 --- a/tests/auto/qstringbuilder1/qstringbuilder1.pro +++ b/tests/auto/qstringbuilder1/qstringbuilder1.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder1 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder1.cpp diff --git a/tests/auto/qstringbuilder2/qstringbuilder2.pro b/tests/auto/qstringbuilder2/qstringbuilder2.pro index a57c6f1..8a1554d 100644 --- a/tests/auto/qstringbuilder2/qstringbuilder2.pro +++ b/tests/auto/qstringbuilder2/qstringbuilder2.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder2 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder2.cpp CONFIG += parallel_test diff --git a/tests/auto/qstringbuilder3/qstringbuilder3.pro b/tests/auto/qstringbuilder3/qstringbuilder3.pro index 5aced7c..00e64ee 100644 --- a/tests/auto/qstringbuilder3/qstringbuilder3.pro +++ b/tests/auto/qstringbuilder3/qstringbuilder3.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder3 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder3.cpp CONFIG += parallel_test diff --git a/tests/auto/qstringbuilder4/qstringbuilder4.pro b/tests/auto/qstringbuilder4/qstringbuilder4.pro index 0532a9b..ef7893c 100644 --- a/tests/auto/qstringbuilder4/qstringbuilder4.pro +++ b/tests/auto/qstringbuilder4/qstringbuilder4.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder4 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder4.cpp CONFIG += parallel_test diff --git a/tests/auto/qstringlist/qstringlist.pro b/tests/auto/qstringlist/qstringlist.pro index d82a348..73b8559 100644 --- a/tests/auto/qstringlist/qstringlist.pro +++ b/tests/auto/qstringlist/qstringlist.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringlist SOURCES += tst_qstringlist.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qstringmatcher/qstringmatcher.pro b/tests/auto/qstringmatcher/qstringmatcher.pro index c5249ec..0599163 100644 --- a/tests/auto/qstringmatcher/qstringmatcher.pro +++ b/tests/auto/qstringmatcher/qstringmatcher.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringmatcher SOURCES += tst_qstringmatcher.cpp -QT = core +QT = core testlib DEFINES += QT_NO_CAST_TO_ASCII CONFIG += parallel_test diff --git a/tests/auto/qstringref/qstringref.pro b/tests/auto/qstringref/qstringref.pro index 34f2de4..7aa5f38 100644 --- a/tests/auto/qstringref/qstringref.pro +++ b/tests/auto/qstringref/qstringref.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringref SOURCES += tst_qstringref.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro index 30fb3a5..14f5add 100644 --- a/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro +++ b/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsyntaxhighlighter SOURCES += tst_qsyntaxhighlighter.cpp - - +QT += testlib diff --git a/tests/auto/qtextcursor/qtextcursor.pro b/tests/auto/qtextcursor/qtextcursor.pro index 828b90c..bae85d9 100644 --- a/tests/auto/qtextcursor/qtextcursor.pro +++ b/tests/auto/qtextcursor/qtextcursor.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtextcursor SOURCES += tst_qtextcursor.cpp - - - +QT += testlib diff --git a/tests/auto/qtextformat/qtextformat.pro b/tests/auto/qtextformat/qtextformat.pro index 30f6e50..f810a3b 100644 --- a/tests/auto/qtextformat/qtextformat.pro +++ b/tests/auto/qtextformat/qtextformat.pro @@ -1,9 +1,4 @@ -############################################################ -# Project file for autotest for file qtextformat.h -############################################################ - -load(qttest_p4) - +CONFIG += testcase +TARGET = tst_qtextformat +QT += testlib SOURCES += tst_qtextformat.cpp - - diff --git a/tests/auto/qthreadonce/qthreadonce.pro b/tests/auto/qthreadonce/qthreadonce.pro index d7ef4d4..cd97917 100644 --- a/tests/auto/qthreadonce/qthreadonce.pro +++ b/tests/auto/qthreadonce/qthreadonce.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qthreadonce SOURCES += tst_qthreadonce.cpp -QT = core +QT = core testlib # Don't use gcc's threadsafe statics # Note: some versions of gcc generate invalid code with this option... diff --git a/tests/auto/qthreadpool/qthreadpool.pro b/tests/auto/qthreadpool/qthreadpool.pro index dbaeb20..df13d5f 100644 --- a/tests/auto/qthreadpool/qthreadpool.pro +++ b/tests/auto/qthreadpool/qthreadpool.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qthreadpool SOURCES += tst_qthreadpool.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/qthreadstorage/tst_qthreadstorage.pro index 3071098..791582f 100644 --- a/tests/auto/qthreadstorage/tst_qthreadstorage.pro +++ b/tests/auto/qthreadstorage/tst_qthreadstorage.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qthreadstorage.cpp -QT = core +CONFIG += testcase +TARGET = tst_qthreadstorage +QT = core testlib +SOURCES = tst_qthreadstorage.cpp symbian:LIBS += -llibpthread diff --git a/tests/auto/qtime/qtime.pro b/tests/auto/qtime/qtime.pro index ce4f7ae..bc2c58c 100644 --- a/tests/auto/qtime/qtime.pro +++ b/tests/auto/qtime/qtime.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtime SOURCES += tst_qtime.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qtimeline/qtimeline.pro b/tests/auto/qtimeline/qtimeline.pro index 9be717d..6dfd22a 100644 --- a/tests/auto/qtimeline/qtimeline.pro +++ b/tests/auto/qtimeline/qtimeline.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qtimeline +QT = core testlib SOURCES += tst_qtimeline.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/qtimer/qtimer.pro b/tests/auto/qtimer/qtimer.pro index 086df1d..1b24228 100644 --- a/tests/auto/qtimer/qtimer.pro +++ b/tests/auto/qtimer/qtimer.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qtimer +QT = core testlib SOURCES += tst_qtimer.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/qtokenautomaton/qtokenautomaton.pro b/tests/auto/qtokenautomaton/qtokenautomaton.pro index 5e2e590..a4af4bc 100644 --- a/tests/auto/qtokenautomaton/qtokenautomaton.pro +++ b/tests/auto/qtokenautomaton/qtokenautomaton.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtokenautomaton SOURCES += tst_qtokenautomaton.cpp \ tokenizers/basic/basic.cpp \ tokenizers/basicNamespace/basicNamespace.cpp \ @@ -14,5 +15,5 @@ HEADERS += tokenizers/basic/basic.h \ tokenizers/noToString/noToString.h \ tokenizers/withNamespace/withNamespace.h -QT -= gui +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qtransformedscreen/qtransformedscreen.pro b/tests/auto/qtransformedscreen/qtransformedscreen.pro index 6914054..daea2dd 100644 --- a/tests/auto/qtransformedscreen/qtransformedscreen.pro +++ b/tests/auto/qtransformedscreen/qtransformedscreen.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtransformedscreen SOURCES += tst_qtransformedscreen.cpp +QT += testlib embedded:!contains(gfx-drivers, transformed) { LIBS += ../../../plugins/gfxdrivers/libqgfxtransformed.so diff --git a/tests/auto/qurl/qurl.pro b/tests/auto/qurl/qurl.pro index a5c39a5..01dbf52 100644 --- a/tests/auto/qurl/qurl.pro +++ b/tests/auto/qurl/qurl.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -SOURCES += tst_qurl.cpp -QT = core +CONFIG += testcase +TARGET = tst_qurl +QT = core testlib +SOURCES = tst_qurl.cpp symbian: TARGET.CAPABILITY = NetworkServices CONFIG += parallel_test diff --git a/tests/auto/qvarlengtharray/qvarlengtharray.pro b/tests/auto/qvarlengtharray/qvarlengtharray.pro index 183da1b..cb1cb38 100644 --- a/tests/auto/qvarlengtharray/qvarlengtharray.pro +++ b/tests/auto/qvarlengtharray/qvarlengtharray.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qvarlengtharray +QT = core testlib SOURCES += tst_qvarlengtharray.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/qvector/qvector.pro b/tests/auto/qvector/qvector.pro index a7c3957..12efcc6 100644 --- a/tests/auto/qvector/qvector.pro +++ b/tests/auto/qvector/qvector.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qvector SOURCES += tst_qvector.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qvectornd/qvectornd.pro b/tests/auto/qvectornd/qvectornd.pro index 6346199..9e5155a 100644 --- a/tests/auto/qvectornd/qvectornd.pro +++ b/tests/auto/qvectornd/qvectornd.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qvectornd SOURCES += tst_qvectornd.cpp +QT += testlib diff --git a/tests/auto/qwaitcondition/qwaitcondition.pro b/tests/auto/qwaitcondition/qwaitcondition.pro index 9af0c71..b9cf3af 100644 --- a/tests/auto/qwaitcondition/qwaitcondition.pro +++ b/tests/auto/qwaitcondition/qwaitcondition.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwaitcondition SOURCES += tst_qwaitcondition.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro index e5686be..83b2a6d 100644 --- a/tests/auto/qwindowsurface/qwindowsurface.pro +++ b/tests/auto/qwindowsurface/qwindowsurface.pro @@ -1,5 +1,7 @@ -load(qttest_p4) -SOURCES += tst_qwindowsurface.cpp - +CONFIG += testcase +TARGET = tst_qwindowsurface +QT += widgets widgets-private testlib +QT += gui-private +SOURCES += tst_qwindowsurface.cpp diff --git a/tests/auto/qwritelocker/qwritelocker.pro b/tests/auto/qwritelocker/qwritelocker.pro index 39a98aa..946e75c 100644 --- a/tests/auto/qwritelocker/qwritelocker.pro +++ b/tests/auto/qwritelocker/qwritelocker.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwritelocker SOURCES += tst_qwritelocker.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qwsembedwidget/qwsembedwidget.pro b/tests/auto/qwsembedwidget/qwsembedwidget.pro index c34212b..97cbf94 100644 --- a/tests/auto/qwsembedwidget/qwsembedwidget.pro +++ b/tests/auto/qwsembedwidget/qwsembedwidget.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwsembedwidget +QT += widgets testlib SOURCES += tst_qwsembedwidget.cpp diff --git a/tests/auto/qwsinputmethod/qwsinputmethod.pro b/tests/auto/qwsinputmethod/qwsinputmethod.pro index d549de0..83ea7f2 100644 --- a/tests/auto/qwsinputmethod/qwsinputmethod.pro +++ b/tests/auto/qwsinputmethod/qwsinputmethod.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwsinputmethod +QT += testlib SOURCES += tst_qwsinputmethod.cpp diff --git a/tests/auto/qwswindowsystem/qwswindowsystem.pro b/tests/auto/qwswindowsystem/qwswindowsystem.pro index ee33935..41aa1ae 100644 --- a/tests/auto/qwswindowsystem/qwswindowsystem.pro +++ b/tests/auto/qwswindowsystem/qwswindowsystem.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwswindowsystem +QT += testlib SOURCES += tst_qwswindowsystem.cpp diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro index e87fcf5..3782644 100644 --- a/tests/auto/qx11info/qx11info.pro +++ b/tests/auto/qx11info/qx11info.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qx11info +QT += widgets testlib SOURCES += tst_qx11info.cpp - - diff --git a/tests/auto/qxmlinputsource/qxmlinputsource.pro b/tests/auto/qxmlinputsource/qxmlinputsource.pro index ec83f47..a8bf834 100644 --- a/tests/auto/qxmlinputsource/qxmlinputsource.pro +++ b/tests/auto/qxmlinputsource/qxmlinputsource.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qxmlinputsource SOURCES += tst_qxmlinputsource.cpp -QT += core xml network +QT += core xml network testlib QT -= gui diff --git a/tests/auto/utf8/utf8.pro b/tests/auto/utf8/utf8.pro index aa133fe..2d200e8 100644 --- a/tests/auto/utf8/utf8.pro +++ b/tests/auto/utf8/utf8.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -QT -= gui +CONFIG += testcase +TARGET = tst_utf8 +QT = core testlib SOURCES += tst_utf8.cpp CONFIG += parallel_test diff --git a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro index 9ed1090..3a581e1 100644 --- a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro +++ b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_network_remote_stresstest -QT = core network +QT = core network testlib SOURCES += tst_network_remote_stresstest.cpp diff --git a/tests/manual/network_stresstest/network_stresstest.pro b/tests/manual/network_stresstest/network_stresstest.pro index 0e272d1..caa8436 100644 --- a/tests/manual/network_stresstest/network_stresstest.pro +++ b/tests/manual/network_stresstest/network_stresstest.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_network_stresstest -QT = core network +QT = core network testlib SOURCES += tst_network_stresstest.cpp \ minihttpserver.cpp diff --git a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro index 2471389..d73124c 100644 --- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,11 +1,11 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_qhttpnetworkconnection DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro index 060acf5..479a1e6 100644 --- a/tests/manual/qnetworkreply/qnetworkreply.pro +++ b/tests/manual/qnetworkreply/qnetworkreply.pro @@ -1,11 +1,11 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_qnetworkreply DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/manual/qssloptions/qssloptions.pro b/tests/manual/qssloptions/qssloptions.pro index c1c8446..3fcb696 100644 --- a/tests/manual/qssloptions/qssloptions.pro +++ b/tests/manual/qssloptions/qssloptions.pro @@ -1,11 +1,11 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_qssloptions DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib #CONFIG += release diff --git a/tests/manual/socketengine/socketengine.pro b/tests/manual/socketengine/socketengine.pro index 76a40be..74facf7 100644 --- a/tests/manual/socketengine/socketengine.pro +++ b/tests/manual/socketengine/socketengine.pro @@ -1,11 +1,11 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_socketengine DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release -- cgit v0.12 From a8469f14c26b6db70b97578655b22e4b3ec93cfc Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 26 Nov 2011 21:08:42 +0100 Subject: tests: allow unstable tests to be marked with CONFIG+=insignificant_test Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a Reviewed-by: Jo Asplin --- tests/auto/bic/bic.pro | 1 + tests/auto/compilerwarnings/compilerwarnings.pro | 2 ++ tests/auto/declarative/examples/examples.pro | 1 + .../declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro | 1 + .../auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro | 2 +- tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro | 1 + tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro | 1 + tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro | 2 +- tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro | 2 ++ .../qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro | 1 + tests/auto/declarative/qmlvisual/qmlvisual.pro | 2 ++ tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro | 2 ++ tests/auto/guiapplauncher/guiapplauncher.pro | 2 ++ tests/auto/headers/headers.pro | 2 ++ tests/auto/languagechange/languagechange.pro | 1 + tests/auto/macgui/macgui.pro | 1 + tests/auto/macnativeevents/macnativeevents.pro | 2 ++ tests/auto/mediaobject/mediaobject.pro | 1 + tests/auto/networkselftest/networkselftest.pro | 1 + tests/auto/q3actiongroup/q3actiongroup.pro | 2 +- tests/auto/q3socket/q3socket.pro | 2 +- tests/auto/q3sqlcursor/q3sqlcursor.pro | 2 +- tests/auto/q3urloperator/q3urloperator.pro | 2 +- tests/auto/qabstractfileengine/qabstractfileengine.pro | 1 + tests/auto/qaccessibility/qaccessibility.pro | 2 ++ tests/auto/qapplication/qapplication.pro | 1 - tests/auto/qapplication/test/test.pro | 4 ++-- tests/auto/qaudioinput/qaudioinput.pro | 1 + tests/auto/qcolumnview/qcolumnview.pro | 2 ++ tests/auto/qdbusmarshall/test/test.pro | 2 ++ tests/auto/qdbuspendingcall/qdbuspendingcall.pro | 1 + tests/auto/qeventloop/qeventloop.pro | 4 +++- tests/auto/qfile/largefile/largefile.pro | 1 + tests/auto/qfile/test/test.pro | 2 ++ tests/auto/qfileinfo/qfileinfo.pro | 2 ++ tests/auto/qfilesystemmodel/qfilesystemmodel.pro | 2 ++ tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro | 1 + tests/auto/qfocusevent/qfocusevent.pro | 1 + tests/auto/qfont/qfont.pro | 2 +- tests/auto/qftp/qftp.pro | 2 ++ tests/auto/qgl/qgl.pro | 1 + tests/auto/qglthreads/qglthreads.pro | 2 ++ tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro | 2 ++ tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro | 2 ++ tests/auto/qgraphicseffect/qgraphicseffect.pro | 2 ++ tests/auto/qgraphicsitem/qgraphicsitem.pro | 2 +- tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro | 2 +- tests/auto/qgraphicsscene/qgraphicsscene.pro | 2 ++ tests/auto/qgraphicstransform/qgraphicstransform.pro | 2 ++ tests/auto/qgraphicsview/qgraphicsview.pro | 2 ++ tests/auto/qgraphicswidget/qgraphicswidget.pro | 2 +- tests/auto/qhostinfo/qhostinfo.pro | 2 ++ tests/auto/qhttp/qhttp.pro | 2 ++ tests/auto/qimagereader/qimagereader.pro | 2 ++ tests/auto/qinputcontext/qinputcontext.pro | 2 ++ tests/auto/qinputdialog/qinputdialog.pro | 2 +- tests/auto/qlistwidget/qlistwidget.pro | 2 +- tests/auto/qlocalsocket/qlocalsocket.pro | 2 ++ tests/auto/qmacstyle/qmacstyle.pro | 2 +- tests/auto/qmdiarea/qmdiarea.pro | 2 ++ tests/auto/qmdisubwindow/qmdisubwindow.pro | 2 +- tests/auto/qmenu/qmenu.pro | 2 +- tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro | 2 ++ .../qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro | 2 ++ tests/auto/qnetworkreply/qnetworkreply.pro | 2 ++ tests/auto/qnetworkreply/test/test.pro | 2 ++ tests/auto/qnetworksession/test/test.pro | 2 ++ tests/auto/qpainter/qpainter.pro | 2 +- tests/auto/qpauseanimation/qpauseanimation.pro | 2 +- tests/auto/qpixmap/qpixmap.pro | 2 ++ tests/auto/qpluginloader/tst/tst.pro | 4 +++- tests/auto/qprinter/qprinter.pro | 2 +- tests/auto/qscriptcontext/qscriptcontext.pro | 2 +- tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro | 2 ++ tests/auto/qscrollbar/qscrollbar.pro | 2 +- tests/auto/qsettings/qsettings.pro | 2 ++ tests/auto/qsharedpointer/qsharedpointer.pro | 2 ++ tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro | 2 ++ tests/auto/qsocketnotifier/qsocketnotifier.pro | 2 +- tests/auto/qsocks5socketengine/qsocks5socketengine.pro | 2 ++ tests/auto/qsslsocket/qsslsocket.pro | 2 ++ .../qsslsocket_onDemandCertificates_member.pro | 2 ++ .../qsslsocket_onDemandCertificates_static.pro | 2 ++ tests/auto/qstylesheetstyle/qstylesheetstyle.pro | 2 ++ tests/auto/qtableview/qtableview.pro | 1 + tests/auto/qtcpserver/qtcpserver.pro | 2 -- tests/auto/qtcpserver/test/test.pro | 2 +- tests/auto/qtcpsocket/test/test.pro | 4 ++-- tests/auto/qtextlayout/qtextlayout.pro | 1 + tests/auto/qtextscriptengine/qtextscriptengine.pro | 2 +- tests/auto/qtimeline/qtimeline.pro | 2 ++ tests/auto/qtooltip/qtooltip.pro | 2 ++ tests/auto/qudpsocket/qudpsocket.pro | 2 +- tests/auto/qudpsocket/test/test.pro | 2 ++ tests/auto/qvariant/qvariant.pro | 2 ++ tests/auto/qwebpage/qwebpage.pro | 1 + tests/auto/qwidget/qwidget.pro | 2 ++ tests/auto/qwizard/qwizard.pro | 2 +- tests/auto/selftests/selftests.pro | 2 ++ tests/auto/symbols/symbols.pro | 2 +- tests/auto/uic3/uic3.pro | 1 + tests/auto/xmlpatterns/xmlpatterns.pro | 2 ++ 102 files changed, 155 insertions(+), 35 deletions(-) diff --git a/tests/auto/bic/bic.pro b/tests/auto/bic/bic.pro index 82711c9..5aae774 100644 --- a/tests/auto/bic/bic.pro +++ b/tests/auto/bic/bic.pro @@ -8,3 +8,4 @@ wince*:{ DEFINES += SRCDIR=\\\"$$PWD/\\\" } +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/compilerwarnings/compilerwarnings.pro b/tests/auto/compilerwarnings/compilerwarnings.pro index beb0279..1f6d1e9 100644 --- a/tests/auto/compilerwarnings/compilerwarnings.pro +++ b/tests/auto/compilerwarnings/compilerwarnings.pro @@ -2,3 +2,5 @@ load(qttest_p4) SOURCES += tst_compilerwarnings.cpp QT = core RESOURCES = compilerwarnings.qrc + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index dafc146..1f25769 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -18,3 +18,4 @@ symbian: { CONFIG += parallel_test +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro index a7463e8..c5b1bfa 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -15,3 +15,4 @@ symbian: { CONFIG += parallel_test +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro index 8aea1b5..c293fea 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro @@ -23,4 +23,4 @@ symbian: { OTHER_FILES = data/backtrace1.js data/backtrace1.qml CONFIG += parallel_test - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro index 29b7149..0c7240a 100644 --- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro +++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro @@ -9,3 +9,4 @@ macx:CONFIG -= app_bundle CONFIG += parallel_test +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro index a22c8b5..5bf8095 100644 --- a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro @@ -15,3 +15,4 @@ symbian: { CONFIG += parallel_test +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro index 290cda3..c0831f7 100644 --- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro @@ -18,4 +18,4 @@ symbian: { } CONFIG += parallel_test - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro index 398139a..5a9e7f7 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro @@ -9,3 +9,5 @@ SOURCES += tst_qdeclarativetimer.cpp } CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 8aefb8e..4b5bf6e 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -18,3 +18,4 @@ symbian: { CONFIG += parallel_test +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/declarative/qmlvisual/qmlvisual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro index 416f8d9..36d2600 100644 --- a/tests/auto/declarative/qmlvisual/qmlvisual.pro +++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro @@ -33,3 +33,5 @@ symbian: { } CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro index d0945a4..9ef634e 100644 --- a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro +++ b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro @@ -1,3 +1,5 @@ load(qttest_p4) HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h SOURCES += tst_exceptionsafety_objects.cpp + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/guiapplauncher/guiapplauncher.pro b/tests/auto/guiapplauncher/guiapplauncher.pro index 1fe9c8b..1f7a5fc 100644 --- a/tests/auto/guiapplauncher/guiapplauncher.pro +++ b/tests/auto/guiapplauncher/guiapplauncher.pro @@ -20,3 +20,5 @@ win32:LIBS+=-luser32 x11 { LIBS += $$QMAKE_LIBS_X11 } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/headers/headers.pro b/tests/auto/headers/headers.pro index 74e1a02..4bc02fe 100644 --- a/tests/auto/headers/headers.pro +++ b/tests/auto/headers/headers.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_headers.cpp headersclean.cpp QT = core + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/languagechange/languagechange.pro b/tests/auto/languagechange/languagechange.pro index 1a1d91e..a57600d 100644 --- a/tests/auto/languagechange/languagechange.pro +++ b/tests/auto/languagechange/languagechange.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_languagechange.cpp +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/macgui/macgui.pro b/tests/auto/macgui/macgui.pro index 0ed2350..095a507 100644 --- a/tests/auto/macgui/macgui.pro +++ b/tests/auto/macgui/macgui.pro @@ -9,3 +9,4 @@ HEADERS += guitest.h requires(mac) +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/macnativeevents/macnativeevents.pro b/tests/auto/macnativeevents/macnativeevents.pro index af34942..39a3523 100644 --- a/tests/auto/macnativeevents/macnativeevents.pro +++ b/tests/auto/macnativeevents/macnativeevents.pro @@ -14,3 +14,5 @@ SOURCES += expectedeventlist.cpp nativeeventlist.cpp SOURCES += tst_macnativeevents.cpp requires(mac) + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/mediaobject/mediaobject.pro b/tests/auto/mediaobject/mediaobject.pro index 23ec56b..71650cf 100644 --- a/tests/auto/mediaobject/mediaobject.pro +++ b/tests/auto/mediaobject/mediaobject.pro @@ -22,3 +22,4 @@ symbian:{ TARGET.CAPABILITY += "NetworkServices" } +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/networkselftest/networkselftest.pro b/tests/auto/networkselftest/networkselftest.pro index 2742fcb..691eab1 100644 --- a/tests/auto/networkselftest/networkselftest.pro +++ b/tests/auto/networkselftest/networkselftest.pro @@ -19,3 +19,4 @@ wince*: { DEFINES += SRCDIR=\\\"$$PWD/\\\" } +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/q3actiongroup/q3actiongroup.pro b/tests/auto/q3actiongroup/q3actiongroup.pro index 139e48c..c6c5f17 100644 --- a/tests/auto/q3actiongroup/q3actiongroup.pro +++ b/tests/auto/q3actiongroup/q3actiongroup.pro @@ -3,4 +3,4 @@ QT += qt3support requires(contains(QT_CONFIG,qt3support)) SOURCES += tst_q3actiongroup.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/q3socket/q3socket.pro b/tests/auto/q3socket/q3socket.pro index a8324e9..32d3850 100644 --- a/tests/auto/q3socket/q3socket.pro +++ b/tests/auto/q3socket/q3socket.pro @@ -4,4 +4,4 @@ SOURCES += tst_qsocket.cpp QT += network qt3support requires(contains(QT_CONFIG,qt3support)) - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/q3sqlcursor/q3sqlcursor.pro b/tests/auto/q3sqlcursor/q3sqlcursor.pro index 2d316fb..dc91f08 100644 --- a/tests/auto/q3sqlcursor/q3sqlcursor.pro +++ b/tests/auto/q3sqlcursor/q3sqlcursor.pro @@ -7,4 +7,4 @@ requires(contains(QT_CONFIG,qt3support)) win32:LIBS += -lws2_32 - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/q3urloperator/q3urloperator.pro b/tests/auto/q3urloperator/q3urloperator.pro index 29282eb..645c519 100644 --- a/tests/auto/q3urloperator/q3urloperator.pro +++ b/tests/auto/q3urloperator/q3urloperator.pro @@ -7,4 +7,4 @@ requires(contains(QT_CONFIG,qt3support)) QT += network - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qabstractfileengine/qabstractfileengine.pro b/tests/auto/qabstractfileengine/qabstractfileengine.pro index d498b53..cdfba9c 100644 --- a/tests/auto/qabstractfileengine/qabstractfileengine.pro +++ b/tests/auto/qabstractfileengine/qabstractfileengine.pro @@ -5,3 +5,4 @@ QT = core testlib SOURCES = tst_qabstractfileengine.cpp RESOURCES += qabstractfileengine.qrc +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro index 71d6f95..c4d0fcd 100644 --- a/tests/auto/qaccessibility/qaccessibility.pro +++ b/tests/auto/qaccessibility/qaccessibility.pro @@ -10,3 +10,5 @@ wince*: { accessneeded.path = accessible DEPLOYMENT += accessneeded } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qapplication/qapplication.pro b/tests/auto/qapplication/qapplication.pro index becc6c6..441e353 100644 --- a/tests/auto/qapplication/qapplication.pro +++ b/tests/auto/qapplication/qapplication.pro @@ -4,4 +4,3 @@ SUBDIRS = test \ modal \ wincmdline - diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro index 73799f4..27cc0ba 100644 --- a/tests/auto/qapplication/test/test.pro +++ b/tests/auto/qapplication/test/test.pro @@ -24,9 +24,9 @@ symbian: { win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qapplication -} else { + } else { TARGET = ../../release/tst_qapplication } } - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro index aac7fb4..d7ae7bc 100644 --- a/tests/auto/qaudioinput/qaudioinput.pro +++ b/tests/auto/qaudioinput/qaudioinput.pro @@ -13,3 +13,4 @@ wince* { !symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\" } +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro index 754f06f..5412e8e 100644 --- a/tests/auto/qcolumnview/qcolumnview.pro +++ b/tests/auto/qcolumnview/qcolumnview.pro @@ -2,3 +2,5 @@ CONFIG += qttest_p4 SOURCES += tst_qcolumnview.cpp TARGET = tst_qcolumnview + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qdbusmarshall/test/test.pro b/tests/auto/qdbusmarshall/test/test.pro index 71fc656..573af8a 100644 --- a/tests/auto/qdbusmarshall/test/test.pro +++ b/tests/auto/qdbusmarshall/test/test.pro @@ -7,3 +7,5 @@ QT += dbus LIBS += $$QT_LIBS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro index dd8f141..03b5959 100644 --- a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro +++ b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro @@ -3,3 +3,4 @@ requires(contains(QT_CONFIG, dbus)) QT = core dbus SOURCES += tst_qdbuspendingcall.cpp +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qeventloop/qeventloop.pro b/tests/auto/qeventloop/qeventloop.pro index e7489fa..8e6a962 100644 --- a/tests/auto/qeventloop/qeventloop.pro +++ b/tests/auto/qeventloop/qeventloop.pro @@ -5,4 +5,6 @@ QT += network win32:!wince*:LIBS += -luser32 -symbian:TARGET.CAPABILITY += NetworkServices \ No newline at end of file +symbian:TARGET.CAPABILITY += NetworkServices + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qfile/largefile/largefile.pro b/tests/auto/qfile/largefile/largefile.pro index 6407cb6..ea305ec 100644 --- a/tests/auto/qfile/largefile/largefile.pro +++ b/tests/auto/qfile/largefile/largefile.pro @@ -6,3 +6,4 @@ SOURCES += tst_largefile.cpp wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp CONFIG += parallel_test +CONFIG += insignificant_test diff --git a/tests/auto/qfile/test/test.pro b/tests/auto/qfile/test/test.pro index c0049b0..74e5041 100644 --- a/tests/auto/qfile/test/test.pro +++ b/tests/auto/qfile/test/test.pro @@ -40,3 +40,5 @@ win32 { symbian { LIBS+=-lefsrv } + +mac*:CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index d0e284b..a7f7280 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -35,3 +35,5 @@ wince* { contains(QT_CONFIG, qt3support): QT += qt3support CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro index 04cea48..65f25e0 100644 --- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro @@ -14,3 +14,5 @@ symbian: { DEPLOYMENT += dummyDeploy LIBS += -lefsrv } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro index 75e85a0..8149de1 100644 --- a/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro +++ b/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro @@ -3,3 +3,4 @@ SOURCES += tst_qfilesystemwatcher.cpp QT = core CONFIG += parallel_test +mac*:CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qfocusevent/qfocusevent.pro b/tests/auto/qfocusevent/qfocusevent.pro index 83ed9eb..7ae1ded 100644 --- a/tests/auto/qfocusevent/qfocusevent.pro +++ b/tests/auto/qfocusevent/qfocusevent.pro @@ -4,3 +4,4 @@ SOURCES += tst_qfocusevent.cpp contains(QT_CONFIG, qt3support): QT += qt3support +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qfont/qfont.pro b/tests/auto/qfont/qfont.pro index b071d88..67263b8 100644 --- a/tests/auto/qfont/qfont.pro +++ b/tests/auto/qfont/qfont.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qfont.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro index ac1702e..0107d9d 100644 --- a/tests/auto/qftp/qftp.pro +++ b/tests/auto/qftp/qftp.pro @@ -18,3 +18,5 @@ wince*: { } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro index 20f8018..ae8fe54 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/qgl/qgl.pro @@ -12,3 +12,4 @@ win32:!wince*: DEFINES += QT_NO_EGL SOURCES += tst_qgl.cpp RESOURCES = qgl.qrc +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qglthreads/qglthreads.pro b/tests/auto/qglthreads/qglthreads.pro index 883eef2..f3b08ea 100644 --- a/tests/auto/qglthreads/qglthreads.pro +++ b/tests/auto/qglthreads/qglthreads.pro @@ -10,3 +10,5 @@ SOURCES += tst_qglthreads.cpp x11 { LIBS += $$QMAKE_LIBS_X11 } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index 8768425..6d83605 100644 --- a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qgraphicsanchorlayout.cpp CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro index 90b7878..f685b57 100644 --- a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro +++ b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qgraphicsanchorlayout1.cpp CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro index 94b3ce6..59084b5 100644 --- a/tests/auto/qgraphicseffect/qgraphicseffect.pro +++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qgraphicseffect.cpp CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro index 20acf35..7d2deb2 100644 --- a/tests/auto/qgraphicsitem/qgraphicsitem.pro +++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro @@ -4,4 +4,4 @@ DEFINES += QT_NO_CAST_TO_ASCII win32:!wince*: LIBS += -lUser32 - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro index 08d7b1a..317665f 100644 --- a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro +++ b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qgraphicsproxywidget.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro index 82fa423..56f86e4 100644 --- a/tests/auto/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro @@ -18,3 +18,5 @@ wince*:{ } symbian:TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # Min 1Mb, max 16Mb + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicstransform/qgraphicstransform.pro b/tests/auto/qgraphicstransform/qgraphicstransform.pro index 67c939e..9b30ea1 100644 --- a/tests/auto/qgraphicstransform/qgraphicstransform.pro +++ b/tests/auto/qgraphicstransform/qgraphicstransform.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qgraphicstransform.cpp CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/qgraphicsview/qgraphicsview.pro index 5e7e53d..4e6b8ba 100644 --- a/tests/auto/qgraphicsview/qgraphicsview.pro +++ b/tests/auto/qgraphicsview/qgraphicsview.pro @@ -3,3 +3,5 @@ SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp DEFINES += QT_NO_CAST_TO_ASCII symbian:TARGET.EPOCHEAPSIZE = 1000000 10000000 + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicswidget/qgraphicswidget.pro b/tests/auto/qgraphicswidget/qgraphicswidget.pro index ae61c2a..c749e47 100644 --- a/tests/auto/qgraphicswidget/qgraphicswidget.pro +++ b/tests/auto/qgraphicswidget/qgraphicswidget.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qgraphicswidget.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/qhostinfo/qhostinfo.pro index 97197a9..c9e7464 100644 --- a/tests/auto/qhostinfo/qhostinfo.pro +++ b/tests/auto/qhostinfo/qhostinfo.pro @@ -14,3 +14,5 @@ symbian: TARGET.CAPABILITY = NetworkServices symbian: { INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/qhttp/qhttp.pro index 49eebd5..fd8924b 100644 --- a/tests/auto/qhttp/qhttp.pro +++ b/tests/auto/qhttp/qhttp.pro @@ -27,3 +27,5 @@ wince*: { } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro index a9bfa1d..650b1c2 100644 --- a/tests/auto/qimagereader/qimagereader.pro +++ b/tests/auto/qimagereader/qimagereader.pro @@ -41,3 +41,5 @@ symbian: { DEPLOYMENT += imagePlugins } } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/qinputcontext/qinputcontext.pro index 4b3ab96..8cd956d 100644 --- a/tests/auto/qinputcontext/qinputcontext.pro +++ b/tests/auto/qinputcontext/qinputcontext.pro @@ -6,3 +6,5 @@ contains(QT_CONFIG, webkit):QT += webkit symbian { LIBS += -lws32 -lcone } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qinputdialog/qinputdialog.pro b/tests/auto/qinputdialog/qinputdialog.pro index 2f68a40..f3fad58 100644 --- a/tests/auto/qinputdialog/qinputdialog.pro +++ b/tests/auto/qinputdialog/qinputdialog.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qinputdialog.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro index faf970d..2bc1976 100644 --- a/tests/auto/qlistwidget/qlistwidget.pro +++ b/tests/auto/qlistwidget/qlistwidget.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qlistwidget.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qlocalsocket/qlocalsocket.pro b/tests/auto/qlocalsocket/qlocalsocket.pro index 3911a64..32bd456 100644 --- a/tests/auto/qlocalsocket/qlocalsocket.pro +++ b/tests/auto/qlocalsocket/qlocalsocket.pro @@ -2,3 +2,5 @@ TEMPLATE = subdirs SUBDIRS = lackey test !wince*:!symbian: SUBDIRS += example symbian: TARGET.CAPABILITY = NetworkServices + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qmacstyle/qmacstyle.pro b/tests/auto/qmacstyle/qmacstyle.pro index d80df70..698ca1e 100644 --- a/tests/auto/qmacstyle/qmacstyle.pro +++ b/tests/auto/qmacstyle/qmacstyle.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qmacstyle.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/qmdiarea/qmdiarea.pro index 3b81c9e..7fa7575 100644 --- a/tests/auto/qmdiarea/qmdiarea.pro +++ b/tests/auto/qmdiarea/qmdiarea.pro @@ -7,3 +7,5 @@ contains(QT_CONFIG, opengl):QT += opengl mac { LIBS += -framework Security } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qmdisubwindow/qmdisubwindow.pro b/tests/auto/qmdisubwindow/qmdisubwindow.pro index 2b93523..820c420 100644 --- a/tests/auto/qmdisubwindow/qmdisubwindow.pro +++ b/tests/auto/qmdisubwindow/qmdisubwindow.pro @@ -3,4 +3,4 @@ INCLUDEPATH += . SOURCES += tst_qmdisubwindow.cpp DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - +mac*:CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qmenu/qmenu.pro b/tests/auto/qmenu/qmenu.pro index e1fcb88..55a1383 100644 --- a/tests/auto/qmenu/qmenu.pro +++ b/tests/auto/qmenu/qmenu.pro @@ -4,4 +4,4 @@ SOURCES += tst_qmenu.cpp contains(QT_CONFIG, qt3support): QT += qt3support - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro index ca463bd..e95ff3d 100644 --- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro +++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro @@ -13,3 +13,5 @@ maemo6|maemo5 { PKGCONFIG += conninet } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro index d9c1d6b..3ae5122 100644 --- a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -13,3 +13,5 @@ maemo6|maemo5 { PKGCONFIG += conninet } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qnetworkreply/qnetworkreply.pro b/tests/auto/qnetworkreply/qnetworkreply.pro index 86d3155..7d5c4c1 100644 --- a/tests/auto/qnetworkreply/qnetworkreply.pro +++ b/tests/auto/qnetworkreply/qnetworkreply.pro @@ -5,3 +5,5 @@ requires(contains(QT_CONFIG,private_tests)) !wince*:SUBDIRS += echo symbian: TARGET.CAPABILITY = NetworkServices + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro index 5c9bbdd..ce479d0 100644 --- a/tests/auto/qnetworkreply/test/test.pro +++ b/tests/auto/qnetworkreply/test/test.pro @@ -34,3 +34,5 @@ symbian:{ TARGET.EPOCHEAPSIZE="0x100 0x1000000" TARGET.CAPABILITY="ALL -TCB" } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qnetworksession/test/test.pro b/tests/auto/qnetworksession/test/test.pro index bfffe90..645b061 100644 --- a/tests/auto/qnetworksession/test/test.pro +++ b/tests/auto/qnetworksession/test/test.pro @@ -24,3 +24,5 @@ maemo6|maemo5 { PKGCONFIG += conninet } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro index ee624e1..030b344 100644 --- a/tests/auto/qpainter/qpainter.pro +++ b/tests/auto/qpainter/qpainter.pro @@ -13,4 +13,4 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD\\\" } - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qpauseanimation/qpauseanimation.pro b/tests/auto/qpauseanimation/qpauseanimation.pro index 4599cf0..dbe9405 100644 --- a/tests/auto/qpauseanimation/qpauseanimation.pro +++ b/tests/auto/qpauseanimation/qpauseanimation.pro @@ -2,4 +2,4 @@ load(qttest_p4) QT = core gui SOURCES += tst_qpauseanimation.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro index e73c130..a54b62b 100644 --- a/tests/auto/qpixmap/qpixmap.pro +++ b/tests/auto/qpixmap/qpixmap.pro @@ -33,3 +33,5 @@ wince*: { } RESOURCES += qpixmap.qrc + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro index be243b8..a222501 100644 --- a/tests/auto/qpluginloader/tst/tst.pro +++ b/tests/auto/qpluginloader/tst/tst.pro @@ -7,7 +7,7 @@ HEADERS += ../theplugin/plugininterface.h win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qpluginloader -} else { + } else { TARGET = ../../release/tst_qpluginloader } } @@ -29,3 +29,5 @@ symbian: { } DEFINES += SRCDIR=\\\"$$PWD/../\\\" + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/qprinter/qprinter.pro index 1df2974..bb6d45f 100644 --- a/tests/auto/qprinter/qprinter.pro +++ b/tests/auto/qprinter/qprinter.pro @@ -5,4 +5,4 @@ SOURCES += tst_qprinter.cpp contains(QT_CONFIG, qt3support): QT += qt3support - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qscriptcontext/qscriptcontext.pro b/tests/auto/qscriptcontext/qscriptcontext.pro index 9746db8..807f5c4 100644 --- a/tests/auto/qscriptcontext/qscriptcontext.pro +++ b/tests/auto/qscriptcontext/qscriptcontext.pro @@ -2,4 +2,4 @@ load(qttest_p4) QT = core script SOURCES += tst_qscriptcontext.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro index e1c6234..498fc1a 100644 --- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro +++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro @@ -3,3 +3,5 @@ QT = core script SOURCES += tst_qscriptv8testsuite.cpp RESOURCES += qscriptv8testsuite.qrc include(abstracttestsuite.pri) + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qscrollbar/qscrollbar.pro b/tests/auto/qscrollbar/qscrollbar.pro index 63a923f..3ead270 100644 --- a/tests/auto/qscrollbar/qscrollbar.pro +++ b/tests/auto/qscrollbar/qscrollbar.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qscrollbar.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsettings/qsettings.pro b/tests/auto/qsettings/qsettings.pro index fe104df..7471c7e 100644 --- a/tests/auto/qsettings/qsettings.pro +++ b/tests/auto/qsettings/qsettings.pro @@ -8,3 +8,5 @@ CONFIG += release win32-msvc*:LIBS += advapi32.lib CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/qsharedpointer/qsharedpointer.pro index 37ab4ce..0542d6b 100644 --- a/tests/auto/qsharedpointer/qsharedpointer.pro +++ b/tests/auto/qsharedpointer/qsharedpointer.pro @@ -18,3 +18,5 @@ integrity { include(externaltests.pri) CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro index db647a5..c542d7d 100644 --- a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro +++ b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qsharedpointer_and_qwidget.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/qsocketnotifier/qsocketnotifier.pro index 27484c8..23e4983 100644 --- a/tests/auto/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/qsocketnotifier/qsocketnotifier.pro @@ -8,4 +8,4 @@ include(../platformsocketengine/platformsocketengine.pri) symbian: TARGET.CAPABILITY = NetworkServices - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro index c82c62d..982bfac 100644 --- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro @@ -15,3 +15,5 @@ symbian: TARGET.CAPABILITY = NetworkServices requires(contains(QT_CONFIG,private_tests)) + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro index 77517e0..0566011 100644 --- a/tests/auto/qsslsocket/qsslsocket.pro +++ b/tests/auto/qsslsocket/qsslsocket.pro @@ -35,3 +35,5 @@ wince* { } requires(contains(QT_CONFIG,private_tests)) + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index 0c26ee5..6bed9ff 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro @@ -26,3 +26,5 @@ wince* { } requires(contains(QT_CONFIG,private_tests)) + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index d4e7602..6a649ab 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -26,3 +26,5 @@ wince* { } requires(contains(QT_CONFIG,private_tests)) + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro index eada969..be21df7 100644 --- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro @@ -4,3 +4,5 @@ load(qttest_p4) SOURCES += tst_qstylesheetstyle.cpp RESOURCES += resources.qrc requires(contains(QT_CONFIG,private_tests)) + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro index 72099d4..dcda6ae 100644 --- a/tests/auto/qtableview/qtableview.pro +++ b/tests/auto/qtableview/qtableview.pro @@ -2,3 +2,4 @@ load(qttest_p4) TARGET.EPOCHEAPSIZE = 0x200000 0x800000 SOURCES += tst_qtableview.cpp +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtcpserver/qtcpserver.pro b/tests/auto/qtcpserver/qtcpserver.pro index e123cfe..71821b4 100644 --- a/tests/auto/qtcpserver/qtcpserver.pro +++ b/tests/auto/qtcpserver/qtcpserver.pro @@ -1,4 +1,2 @@ TEMPLATE = subdirs SUBDIRS = test crashingServer - - diff --git a/tests/auto/qtcpserver/test/test.pro b/tests/auto/qtcpserver/test/test.pro index 65e1d82..7484f12 100644 --- a/tests/auto/qtcpserver/test/test.pro +++ b/tests/auto/qtcpserver/test/test.pro @@ -34,4 +34,4 @@ QT = core network MOC_DIR=tmp - +mac*:CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro index 404d5c0..ac5b7d4 100644 --- a/tests/auto/qtcpsocket/test/test.pro +++ b/tests/auto/qtcpsocket/test/test.pro @@ -21,11 +21,11 @@ TARGET = tst_qtcpsocket win32 { CONFIG(debug, debug|release) { DESTDIR = ../debug -} else { + } else { DESTDIR = ../release } } else { DESTDIR = ../ } - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtextlayout/qtextlayout.pro b/tests/auto/qtextlayout/qtextlayout.pro index 381f09e..6efcaec 100644 --- a/tests/auto/qtextlayout/qtextlayout.pro +++ b/tests/auto/qtextlayout/qtextlayout.pro @@ -7,3 +7,4 @@ symbian { TARGET.EPOCHEAPSIZE = 100000 20000000 } +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtextscriptengine/qtextscriptengine.pro b/tests/auto/qtextscriptengine/qtextscriptengine.pro index 128b9af..f30edc0 100644 --- a/tests/auto/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/qtextscriptengine/qtextscriptengine.pro @@ -3,4 +3,4 @@ HEADERS += SOURCES += tst_qtextscriptengine.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtimeline/qtimeline.pro b/tests/auto/qtimeline/qtimeline.pro index 6dfd22a..8b0229a 100644 --- a/tests/auto/qtimeline/qtimeline.pro +++ b/tests/auto/qtimeline/qtimeline.pro @@ -3,3 +3,5 @@ TARGET = tst_qtimeline QT = core testlib SOURCES += tst_qtimeline.cpp CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtooltip/qtooltip.pro b/tests/auto/qtooltip/qtooltip.pro index 0bd0e42..cf5ea3f 100644 --- a/tests/auto/qtooltip/qtooltip.pro +++ b/tests/auto/qtooltip/qtooltip.pro @@ -1,2 +1,4 @@ load(qttest_p4) SOURCES += tst_qtooltip.cpp + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qudpsocket/qudpsocket.pro b/tests/auto/qudpsocket/qudpsocket.pro index 4ddb717..8d40843 100644 --- a/tests/auto/qudpsocket/qudpsocket.pro +++ b/tests/auto/qudpsocket/qudpsocket.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = test clientserver - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qudpsocket/test/test.pro b/tests/auto/qudpsocket/test/test.pro index b68d30c..eeca683 100644 --- a/tests/auto/qudpsocket/test/test.pro +++ b/tests/auto/qudpsocket/test/test.pro @@ -23,3 +23,5 @@ wince*|symbian: { TARGET = tst_qudpsocket symbian: TARGET.CAPABILITY += NetworkServices + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/qvariant/qvariant.pro index 2c9c8d7..8517d02 100644 --- a/tests/auto/qvariant/qvariant.pro +++ b/tests/auto/qvariant/qvariant.pro @@ -3,3 +3,5 @@ SOURCES += tst_qvariant.cpp QT += network contains(QT_CONFIG, qt3support): QT += qt3support + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qwebpage/qwebpage.pro b/tests/auto/qwebpage/qwebpage.pro index 8d2b5c0..f0c6570 100644 --- a/tests/auto/qwebpage/qwebpage.pro +++ b/tests/auto/qwebpage/qwebpage.pro @@ -12,3 +12,4 @@ contains(QT_CONFIG,webkit) { SOURCES += dummy.cpp } +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro index e39431b..602f403 100644 --- a/tests/auto/qwidget/qwidget.pro +++ b/tests/auto/qwidget/qwidget.pro @@ -24,3 +24,5 @@ symbian { } !wince*:!symbian:win32: LIBS += -luser32 -lgdi32 + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qwizard/qwizard.pro b/tests/auto/qwizard/qwizard.pro index a22e45c..6c79886 100644 --- a/tests/auto/qwizard/qwizard.pro +++ b/tests/auto/qwizard/qwizard.pro @@ -7,4 +7,4 @@ SOURCES += tst_qwizard.cpp RESOURCES = qwizard.qrc TARGET.EPOCHEAPSIZE = 0x200000 0xF00000 - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/selftests/selftests.pro b/tests/auto/selftests/selftests.pro index 1494e38..67e8ae7 100644 --- a/tests/auto/selftests/selftests.pro +++ b/tests/auto/selftests/selftests.pro @@ -15,3 +15,5 @@ QT = core integrity: SUBDIRS -= test CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/symbols/symbols.pro b/tests/auto/symbols/symbols.pro index 2b772f4..f3bde3d 100644 --- a/tests/auto/symbols/symbols.pro +++ b/tests/auto/symbols/symbols.pro @@ -4,4 +4,4 @@ cross_compile: DEFINES += QT_CROSS_COMPILED SOURCES += tst_symbols.cpp QT = core - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/uic3/uic3.pro b/tests/auto/uic3/uic3.pro index 72a1304..164c9b3 100644 --- a/tests/auto/uic3/uic3.pro +++ b/tests/auto/uic3/uic3.pro @@ -9,3 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" requires(contains(QT_CONFIG,qt3support)) +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro index 54dd9aa..3278088 100644 --- a/tests/auto/xmlpatterns/xmlpatterns.pro +++ b/tests/auto/xmlpatterns/xmlpatterns.pro @@ -9,3 +9,5 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\" } include (../xmlpatterns.pri) + +CONFIG+=insignificant_test # QTQAINFRA-428 -- cgit v0.12 From 5991bc3b3b7c638592ec5e7060e467f4838201d8 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 28 Dec 2011 20:59:35 +0100 Subject: tests: eliminated usage of qttest_p4.prf [part 2] qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I8a0bed9161ea9ac010ef3269f2e9baed7bbc2f41 Reviewed-by: Rohan McGovern Reviewed-by: Sergio Ahumada --- tests/auto/headers/headers.pro | 6 +++-- .../patternistexamplefiletree.pro | 6 +++-- tests/auto/patternistheaders/patternistheaders.pro | 6 +++-- tests/auto/qabstractbutton/qabstractbutton.pro | 7 +++--- .../auto/qabstractitemmodel/qabstractitemmodel.pro | 13 +++++------ .../qabstractxmlforwarditerator.pro | 6 +++-- tests/auto/qapplication/test/test.pro | 5 +++-- tests/auto/qaudioinput/qaudioinput.pro | 6 ++--- tests/auto/qcolordialog/qcolordialog.pro | 8 +++---- .../qdbusservicewatcher/qdbusservicewatcher.pro | 5 +++-- tests/auto/qdirmodel/qdirmodel.pro | 7 ++++-- tests/auto/qdrag/qdrag.pro | 9 +++----- tests/auto/qeventloop/qeventloop.pro | 7 +++--- tests/auto/qfileopenevent/test/test.pro | 7 ++++-- tests/auto/qfilesystemmodel/qfilesystemmodel.pro | 9 ++++---- tests/auto/qgl/qgl.pro | 12 +++++----- tests/auto/qgraphicseffect/qgraphicseffect.pro | 5 ++++- .../qgraphicslinearlayout.pro | 6 ++++- .../qgraphicspixmapitem/qgraphicspixmapitem.pro | 4 +++- tests/auto/qgridlayout/qgridlayout.pro | 10 ++++----- .../qhttpnetworkconnection.pro | 8 ++++--- tests/auto/qimage/qimage.pro | 5 ++++- tests/auto/qitemdelegate/qitemdelegate.pro | 7 ++++-- tests/auto/qlayout/qlayout.pro | 9 ++++---- tests/auto/qlistwidget/qlistwidget.pro | 5 ++++- tests/auto/qlocale/test/test.pro | 26 +++++++++------------- tests/auto/qmdiarea/qmdiarea.pro | 8 +++++-- tests/auto/qmovie/qmovie.pro | 6 ++++- .../qnetworkaccessmanager_and_qprogressdialog.pro | 5 +++-- .../qnetworkconfigurationmanager.pro | 5 +++-- tests/auto/qnetworkinterface/qnetworkinterface.pro | 5 +++-- .../auto/qpropertyanimation/qpropertyanimation.pro | 7 +++--- tests/auto/qringbuffer/qringbuffer.pro | 8 +++---- .../auto/qscriptcontextinfo/qscriptcontextinfo.pro | 8 +++---- .../auto/qscriptengineagent/qscriptengineagent.pro | 8 +++---- .../auto/qscriptv8testsuite/qscriptv8testsuite.pro | 6 +++-- .../qscriptvaluegenerated.pro | 5 +++-- .../qscriptvalueiterator/qscriptvalueiterator.pro | 8 +++---- tests/auto/qscrollarea/qscrollarea.pro | 10 +++------ tests/auto/qslider/qslider.pro | 10 +++------ tests/auto/qsourcelocation/qsourcelocation.pro | 5 ++++- tests/auto/qsql/qsql.pro | 7 +++--- tests/auto/qsqldatabase/qsqldatabase.pro | 5 +++-- tests/auto/qsqlquerymodel/qsqlquerymodel.pro | 7 +++--- tests/auto/qsslcertificate/qsslcertificate.pro | 7 +++--- tests/auto/qtableview/qtableview.pro | 6 +++-- tests/auto/qtconcurrentrun/qtconcurrentrun.pro | 7 +++--- .../qtconcurrentthreadengine.pro | 8 ++++--- .../qtextdocumentlayout/qtextdocumentlayout.pro | 7 +++--- tests/auto/qtextscriptengine/qtextscriptengine.pro | 7 ++++-- tests/auto/qtextstream/test/test.pro | 9 ++++---- .../qsharedmemory/qsystemlock/qsystemlock.pro | 12 +++++----- tests/auto/qtipc/qsharedmemory/test/test.pro | 12 +++++----- .../qtipc/qsystemsemaphore/qsystemsemaphore.pro | 10 ++++----- .../qvideosurfaceformat/qvideosurfaceformat.pro | 6 +++-- tests/auto/qwindowsurface/qwindowsurface.pro | 6 ++--- tests/auto/qwineventnotifier/qwineventnotifier.pro | 8 ++++--- tests/auto/qwsembedwidget/qwsembedwidget.pro | 3 ++- tests/auto/qx11info/qx11info.pro | 3 ++- tests/auto/qxmlitem/qxmlitem.pro | 5 ++++- .../auto/qxmlnodemodelindex/qxmlnodemodelindex.pro | 5 ++++- tests/auto/qxmlresultitems/qxmlresultitems.pro | 4 +++- tests/auto/qxmlschema/qxmlschema.pro | 6 +++-- tests/auto/qzip/qzip.pro | 5 ++++- tests/auto/uic/uic.pro | 6 ++--- tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | 9 ++++---- 66 files changed, 269 insertions(+), 209 deletions(-) diff --git a/tests/auto/headers/headers.pro b/tests/auto/headers/headers.pro index 4bc02fe..a143506 100644 --- a/tests/auto/headers/headers.pro +++ b/tests/auto/headers/headers.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_headers +QT = core testlib SOURCES += tst_headers.cpp headersclean.cpp -QT = core CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro index 772c833..d6b8c13 100644 --- a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro +++ b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_patternistexamplefiletree +QT = core testlib SOURCES += tst_patternistexamplefiletree.cpp -QT = core include (../xmlpatterns.pri) diff --git a/tests/auto/patternistheaders/patternistheaders.pro b/tests/auto/patternistheaders/patternistheaders.pro index fe4d670..39a653f 100644 --- a/tests/auto/patternistheaders/patternistheaders.pro +++ b/tests/auto/patternistheaders/patternistheaders.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_patternistheaders +QT = core testlib SOURCES += tst_patternistheaders.cpp -QT = core include (../xmlpatterns.pri) diff --git a/tests/auto/qabstractbutton/qabstractbutton.pro b/tests/auto/qabstractbutton/qabstractbutton.pro index 2e52585..ffc34df 100644 --- a/tests/auto/qabstractbutton/qabstractbutton.pro +++ b/tests/auto/qabstractbutton/qabstractbutton.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qabstractbutton.cpp - +CONFIG += testcase +TARGET = tst_qabstractbutton +QT += testlib +SOURCES += tst_qabstractbutton.cpp diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro index 52c4e96..f8893ba 100644 --- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro @@ -1,9 +1,8 @@ -load(qttest_p4) - -INCLUDEPATH += $$PWD/../modeltest - -SOURCES += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp -HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h - +CONFIG += testcase +TARGET = tst_qabstractitemmodel +QT += testlib +SOURCES += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp +INCLUDEPATH += $$PWD/../modeltest +HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h diff --git a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro index 6bc0c59..ba75b37 100644 --- a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro +++ b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qabstractxmlforwarditerator +QT = core testlib SOURCES += tst_qabstractxmlforwarditerator.cpp -QT = core include (../xmlpatterns.pri) diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro index 27cc0ba..6452369 100644 --- a/tests/auto/qapplication/test/test.pro +++ b/tests/auto/qapplication/test/test.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase -SOURCES += ../tst_qapplication.cpp TARGET = ../tst_qapplication +QT += testlib +SOURCES += ../tst_qapplication.cpp wince* { additional.files = ../desktopsettingsaware/desktopsettingsaware.exe diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro index d7ae7bc..db7e228 100644 --- a/tests/auto/qaudioinput/qaudioinput.pro +++ b/tests/auto/qaudioinput/qaudioinput.pro @@ -1,9 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qaudioinput +QT = core multimedia testlib SOURCES += tst_qaudioinput.cpp -QT = core multimedia - wince* { deploy.files += 4.wav DEPLOYMENT += deploy diff --git a/tests/auto/qcolordialog/qcolordialog.pro b/tests/auto/qcolordialog/qcolordialog.pro index 830f9fa..2900bbc 100644 --- a/tests/auto/qcolordialog/qcolordialog.pro +++ b/tests/auto/qcolordialog/qcolordialog.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qcolordialog.cpp - - +CONFIG += testcase +TARGET = tst_qcolordialog +QT += testlib +SOURCES += tst_qcolordialog.cpp diff --git a/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro b/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro index 4970f16..0a325c9 100644 --- a/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro +++ b/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qdbusservicewatcher +QT = core dbus testlib contains(QT_CONFIG,dbus): { SOURCES += tst_qdbusservicewatcher.cpp QT += dbus diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro index 7037a79..5e6221a 100644 --- a/tests/auto/qdirmodel/qdirmodel.pro +++ b/tests/auto/qdirmodel/qdirmodel.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -SOURCES += tst_qdirmodel.cpp +CONFIG += testcase + +TARGET = tst_qdirmodel +QT += testlib +SOURCES += tst_qdirmodel.cpp wince*|symbian { addit.files = dirtest\\test1\\* diff --git a/tests/auto/qdrag/qdrag.pro b/tests/auto/qdrag/qdrag.pro index ad36fa5..ca1741c 100644 --- a/tests/auto/qdrag/qdrag.pro +++ b/tests/auto/qdrag/qdrag.pro @@ -1,9 +1,6 @@ -############################################################ -# Project file for autotest for file qdrag.h -############################################################ - -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdrag +QT += testlib SOURCES += tst_qdrag.cpp - diff --git a/tests/auto/qeventloop/qeventloop.pro b/tests/auto/qeventloop/qeventloop.pro index 8e6a962..7505c27 100644 --- a/tests/auto/qeventloop/qeventloop.pro +++ b/tests/auto/qeventloop/qeventloop.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qeventloop +QT = core network testlib SOURCES += tst_qeventloop.cpp -QT -= gui -QT += network win32:!wince*:LIBS += -luser32 diff --git a/tests/auto/qfileopenevent/test/test.pro b/tests/auto/qfileopenevent/test/test.pro index 3f16dcf..8efea04 100644 --- a/tests/auto/qfileopenevent/test/test.pro +++ b/tests/auto/qfileopenevent/test/test.pro @@ -1,7 +1,10 @@ -load(qttest_p4) +CONFIG += testcase + TARGET = tst_qfileopenevent -HEADERS += +QT += testlib SOURCES += tst_qfileopenevent.cpp + +HEADERS += symbian { LIBS+=-lefsrv -lapgrfx -lapmime } diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro index 65f25e0..716f72f 100644 --- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro @@ -1,9 +1,8 @@ -CONFIG += qttest_p4 +CONFIG += testcase -QT = core gui - -SOURCES += tst_qfilesystemmodel.cpp -TARGET = tst_qfilesystemmodel +TARGET = tst_qfilesystemmodel +QT += testlib +SOURCES += tst_qfilesystemmodel.cpp symbian: { HEADERS += ../../../include/qtgui/private/qfileinfogatherer_p.h diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro index ae8fe54..7c4b341 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/qgl/qgl.pro @@ -1,15 +1,13 @@ -############################################################ -# Project file for autotest for file qgl.h -############################################################ +CONFIG += testcase -load(qttest_p4) -requires(contains(QT_CONFIG,opengl)) -QT += opengl +TARGET = tst_qgl +QT += opengl testlib +SOURCES += tst_qgl.cpp +requires(contains(QT_CONFIG,opengl)) contains(QT_CONFIG,egl):DEFINES += QGL_EGL win32:!wince*: DEFINES += QT_NO_EGL -SOURCES += tst_qgl.cpp RESOURCES = qgl.qrc CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro index 59084b5..f35809c 100644 --- a/tests/auto/qgraphicseffect/qgraphicseffect.pro +++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qgraphicseffect +QT += testlib SOURCES += tst_qgraphicseffect.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro index df5a827..673f068 100644 --- a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -1,4 +1,8 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qgraphicslinearlayout +QT += testlib SOURCES += tst_qgraphicslinearlayout.cpp + CONFIG += parallel_test diff --git a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro index 6b4db95..de6e029 100644 --- a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro +++ b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro @@ -1,4 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qgraphicspixmapitem +QT += testlib SOURCES += tst_qgraphicspixmapitem.cpp CONFIG += parallel_test diff --git a/tests/auto/qgridlayout/qgridlayout.pro b/tests/auto/qgridlayout/qgridlayout.pro index 00cc5ee..020d39d 100644 --- a/tests/auto/qgridlayout/qgridlayout.pro +++ b/tests/auto/qgridlayout/qgridlayout.pro @@ -1,6 +1,6 @@ -load(qttest_p4) -SOURCES += tst_qgridlayout.cpp -FORMS += sortdialog.ui - - +CONFIG += testcase +TARGET = tst_qgridlayout +QT += testlib +SOURCES += tst_qgridlayout.cpp +FORMS += sortdialog.ui diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro index 223c4e1..76a6cee 100644 --- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,10 +1,12 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qhttpnetworkconnection +QT = core network testlib SOURCES += tst_qhttpnetworkconnection.cpp + INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) -QT = core network - symbian: TARGET.CAPABILITY = NetworkServices symbian: { INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro index 798c82e..475e635 100644 --- a/tests/auto/qimage/qimage.pro +++ b/tests/auto/qimage/qimage.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qimage +QT += testlib SOURCES += tst_qimage.cpp wince*: { diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/qitemdelegate/qitemdelegate.pro index 1206976..90fb32c 100644 --- a/tests/auto/qitemdelegate/qitemdelegate.pro +++ b/tests/auto/qitemdelegate/qitemdelegate.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -SOURCES += tst_qitemdelegate.cpp +CONFIG += testcase + +TARGET = tst_qitemdelegate +QT += testlib +SOURCES += tst_qitemdelegate.cpp win32:!wince*: LIBS += -lUser32 diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro index bb1ae4a..a541e9f 100644 --- a/tests/auto/qlayout/qlayout.pro +++ b/tests/auto/qlayout/qlayout.pro @@ -1,10 +1,9 @@ -############################################################ -# Project file for autotest for file qlayout.h -############################################################ - -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qlayout +QT += testlib SOURCES += tst_qlayout.cpp + contains(QT_CONFIG, qt3support): QT += qt3support wince*|symbian: { addFiles.files = baseline diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro index 2bc1976..2b940d1 100644 --- a/tests/auto/qlistwidget/qlistwidget.pro +++ b/tests/auto/qlistwidget/qlistwidget.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qlistwidget +QT += testlib SOURCES += tst_qlistwidget.cpp CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro index 8117708..174eade 100644 --- a/tests/auto/qlocale/test/test.pro +++ b/tests/auto/qlocale/test/test.pro @@ -1,26 +1,22 @@ -load(qttest_p4) -SOURCES += ../tst_qlocale.cpp +CONFIG += testcase -!wince*: { TARGET = ../tst_qlocale +QT = core network testlib +embedded: QT += gui +SOURCES += ../tst_qlocale.cpp -win32: { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qlocale -} else { - TARGET = ../../release/tst_qlocale +!wince*: { + win32: { + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qlocale + } else { + TARGET = ../../release/tst_qlocale + } } -} } else { TARGET = tst_qlocale } - - -QT = core -QT += network -embedded: QT += gui - wince*: { addFiles.files = \ ../syslocaleapp diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/qmdiarea/qmdiarea.pro index 7fa7575..90fe9f4 100644 --- a/tests/auto/qmdiarea/qmdiarea.pro +++ b/tests/auto/qmdiarea/qmdiarea.pro @@ -1,6 +1,10 @@ -load(qttest_p4) -INCLUDEPATH += . +CONFIG += testcase + +TARGET = tst_qmdiarea +QT += testlib SOURCES += tst_qmdiarea.cpp + +INCLUDEPATH += . DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII contains(QT_CONFIG, opengl):QT += opengl diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro index 855eb9e..3a99c3c 100644 --- a/tests/auto/qmovie/qmovie.pro +++ b/tests/auto/qmovie/qmovie.pro @@ -1,5 +1,9 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qmovie +QT += testlib SOURCES += tst_qmovie.cpp + MOC_DIR=tmp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro index 378deba..d1badaa 100644 --- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro +++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkaccessmanager_and_qprogressdialog SOURCES += tst_qnetworkaccessmanager_and_qprogressdialog.cpp -QT += network +QT += network testlib symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro index 3ae5122..b8f6fd2 100644 --- a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkconfigurationmanager SOURCES += tst_qnetworkconfigurationmanager.cpp HEADERS += ../qbearertestcommon.h -QT = core network +QT = core network testlib symbian { TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData diff --git a/tests/auto/qnetworkinterface/qnetworkinterface.pro b/tests/auto/qnetworkinterface/qnetworkinterface.pro index 1c5feee..85d4388 100644 --- a/tests/auto/qnetworkinterface/qnetworkinterface.pro +++ b/tests/auto/qnetworkinterface/qnetworkinterface.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkinterface SOURCES += tst_qnetworkinterface.cpp -QT = core network +QT = core network testlib symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qpropertyanimation/qpropertyanimation.pro b/tests/auto/qpropertyanimation/qpropertyanimation.pro index 6d6ddbf..de9d3e6 100644 --- a/tests/auto/qpropertyanimation/qpropertyanimation.pro +++ b/tests/auto/qpropertyanimation/qpropertyanimation.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core gui -SOURCES += tst_qpropertyanimation.cpp +CONFIG += testcase +TARGET = tst_qpropertyanimation +QT += testlib +SOURCES += tst_qpropertyanimation.cpp diff --git a/tests/auto/qringbuffer/qringbuffer.pro b/tests/auto/qringbuffer/qringbuffer.pro index 2e4f166..7d822f6 100644 --- a/tests/auto/qringbuffer/qringbuffer.pro +++ b/tests/auto/qringbuffer/qringbuffer.pro @@ -1,7 +1,7 @@ -load(qttest_p4) -SOURCES += tst_qringbuffer.cpp - -QT = core +CONFIG += testcase +TARGET = tst_qringbuffer +QT = core testlib +SOURCES += tst_qringbuffer.cpp CONFIG += parallel_test diff --git a/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro b/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro index 2483414..01fd007 100644 --- a/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro +++ b/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core script -SOURCES += tst_qscriptcontextinfo.cpp - +CONFIG += testcase +TARGET = tst_qscriptcontextinfo +QT = core script testlib +SOURCES += tst_qscriptcontextinfo.cpp diff --git a/tests/auto/qscriptengineagent/qscriptengineagent.pro b/tests/auto/qscriptengineagent/qscriptengineagent.pro index 34c4280..045a166 100644 --- a/tests/auto/qscriptengineagent/qscriptengineagent.pro +++ b/tests/auto/qscriptengineagent/qscriptengineagent.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core script -SOURCES += tst_qscriptengineagent.cpp - +CONFIG += testcase +TARGET = tst_qscriptengineagent +QT = core script testlib +SOURCES += tst_qscriptengineagent.cpp diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro index 498fc1a..4f7cd3a 100644 --- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro +++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro @@ -1,5 +1,7 @@ -load(qttest_p4) -QT = core script +CONFIG += testcase + +TARGET = tst_qscriptv8testsuite +QT = core script testlib SOURCES += tst_qscriptv8testsuite.cpp RESOURCES += qscriptv8testsuite.qrc include(abstracttestsuite.pri) diff --git a/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro b/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro index c3e9912..b2c3fa7 100644 --- a/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro +++ b/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core gui script +TARGET = tst_qscriptvaluegenerated +CONFIG += testcase +QT = core gui script testlib SOURCES += tst_qscriptvalue.cpp HEADERS += tst_qscriptvalue.h diff --git a/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro b/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro index 884efa0..0710ca0 100644 --- a/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro +++ b/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core script -SOURCES += tst_qscriptvalueiterator.cpp - +CONFIG += testcase +TARGET = tst_qscriptvalueiterator +QT = core script testlib +SOURCES += tst_qscriptvalueiterator.cpp diff --git a/tests/auto/qscrollarea/qscrollarea.pro b/tests/auto/qscrollarea/qscrollarea.pro index bcb2ff3..a19f9ae 100644 --- a/tests/auto/qscrollarea/qscrollarea.pro +++ b/tests/auto/qscrollarea/qscrollarea.pro @@ -1,9 +1,5 @@ -############################################################ -# Project file for autotest for file qscrollarea.h -############################################################ - -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qscrollarea +QT += testlib SOURCES += tst_qscrollarea.cpp - - diff --git a/tests/auto/qslider/qslider.pro b/tests/auto/qslider/qslider.pro index 32fcc81..77f9163 100644 --- a/tests/auto/qslider/qslider.pro +++ b/tests/auto/qslider/qslider.pro @@ -1,9 +1,5 @@ -############################################################ -# Project file for autotest for file qslider.h -############################################################ - -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qslider +QT += testlib SOURCES += tst_qslider.cpp - - diff --git a/tests/auto/qsourcelocation/qsourcelocation.pro b/tests/auto/qsourcelocation/qsourcelocation.pro index 3cfcb46..ff39bd3 100644 --- a/tests/auto/qsourcelocation/qsourcelocation.pro +++ b/tests/auto/qsourcelocation/qsourcelocation.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qsourcelocation +QT += testlib SOURCES += tst_qsourcelocation.cpp include (../xmlpatterns.pri) diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro index 9bf30f8..2b49251 100644 --- a/tests/auto/qsql/qsql.pro +++ b/tests/auto/qsql/qsql.pro @@ -1,7 +1,8 @@ -load(qttest_p4) -SOURCES += tst_qsql.cpp +CONFIG += testcase -QT += sql +TARGET = tst_qsql +QT += sql testlib +SOURCES += tst_qsql.cpp contains(QT_CONFIG, qt3support): QT += qt3support diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro index 066c24f..6561c54 100644 --- a/tests/auto/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/qsqldatabase/qsqldatabase.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqldatabase SOURCES += tst_qsqldatabase.cpp -QT += sql +QT += sql testlib contains(QT_CONFIG, qt3support): QT += qt3support diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro index 4b23e94..ec785f5 100644 --- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro +++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro @@ -1,7 +1,8 @@ -load(qttest_p4) -SOURCES += tst_qsqlquerymodel.cpp +CONFIG += testcase -QT += sql +TARGET = tst_qsqlquerymodel +QT += sql testlib +SOURCES += tst_qsqlquerymodel.cpp wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/qsslcertificate/qsslcertificate.pro index 05cce8e..827aa49 100644 --- a/tests/auto/qsslcertificate/qsslcertificate.pro +++ b/tests/auto/qsslcertificate/qsslcertificate.pro @@ -1,10 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsslcertificate +QT = core network testlib SOURCES += tst_qsslcertificate.cpp !wince*:win32:LIBS += -lws2_32 -QT = core network - -TARGET = tst_qsslcertificate win32 { CONFIG(debug, debug|release) { diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro index dcda6ae..cdec41f 100644 --- a/tests/auto/qtableview/qtableview.pro +++ b/tests/auto/qtableview/qtableview.pro @@ -1,5 +1,7 @@ -load(qttest_p4) -TARGET.EPOCHEAPSIZE = 0x200000 0x800000 +CONFIG += testcase + +TARGET = tst_qtableview +QT += testlib SOURCES += tst_qtableview.cpp CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/qtconcurrentrun/qtconcurrentrun.pro index 2457604..159b00a 100644 --- a/tests/auto/qtconcurrentrun/qtconcurrentrun.pro +++ b/tests/auto/qtconcurrentrun/qtconcurrentrun.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qtconcurrentrun +QT = core testlib SOURCES += tst_qtconcurrentrun.cpp -QT = core -CONFIG += parallel_test CONFIG += parallel_test diff --git a/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro index bbfcf5e..f823ac3 100644 --- a/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro +++ b/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qtconcurrentthreadengine +QT = core testlib SOURCES += tst_qtconcurrentthreadengine.cpp -QT = core -CONFIG += parallel_test + CONFIG += parallel_test diff --git a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro index b2dc6a1..f43f735 100644 --- a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro +++ b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qtextdocumentlayout.cpp - +CONFIG += testcase +TARGET = tst_qtextdocumentlayout +QT += testlib +SOURCES += tst_qtextdocumentlayout.cpp diff --git a/tests/auto/qtextscriptengine/qtextscriptengine.pro b/tests/auto/qtextscriptengine/qtextscriptengine.pro index f30edc0..3e4a2da 100644 --- a/tests/auto/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/qtextscriptengine/qtextscriptengine.pro @@ -1,6 +1,9 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qtextscriptengine +QT += testlib +SOURCES += tst_qtextscriptengine.cpp HEADERS += -SOURCES += tst_qtextscriptengine.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro index 8805fb9..54378c8 100644 --- a/tests/auto/qtextstream/test/test.pro +++ b/tests/auto/qtextstream/test/test.pro @@ -1,12 +1,13 @@ -load(qttest_p4) -SOURCES += ../tst_qtextstream.cpp +CONFIG += testcase TARGET = ../tst_qtextstream +QT = core network testlib +SOURCES += ../tst_qtextstream.cpp win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qtextstream -} else { + } else { TARGET = ../../release/tst_qtextstream } } @@ -14,8 +15,6 @@ win32 { RESOURCES += ../qtextstream.qrc contains(QT_CONFIG, qt3support):QT += qt3support -QT = core network - wince*|symbian: { addFiles.files = ../rfc3261.txt ../shift-jis.txt ../task113817.txt ../qtextstream.qrc ../tst_qtextstream.cpp diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro index e232443..88e4312 100644 --- a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro +++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro @@ -1,5 +1,8 @@ -CONFIG += qttest_p4 -#QT = core +CONFIG += testcase + +TARGET = tst_qsystemlock +QT += testlib +SOURCES += tst_qsystemlock.cpp include(../src/src.pri) win32: CONFIG += console @@ -15,8 +18,3 @@ DESTDIR = ./ DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG - -SOURCES += tst_qsystemlock.cpp -TARGET = tst_qsystemlock - - diff --git a/tests/auto/qtipc/qsharedmemory/test/test.pro b/tests/auto/qtipc/qsharedmemory/test/test.pro index 50c2669..4dea9ce 100644 --- a/tests/auto/qtipc/qsharedmemory/test/test.pro +++ b/tests/auto/qtipc/qsharedmemory/test/test.pro @@ -1,18 +1,18 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = ../tst_qsharedmemory +QT = core testlib +SOURCES += ../tst_qsharedmemory.cpp include(../src/src.pri) -QT -= gui DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG -SOURCES += ../tst_qsharedmemory.cpp -TARGET = ../tst_qsharedmemory - !wince*:win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qsharedmemory -} else { + } else { TARGET = ../../release/tst_qsharedmemory } } diff --git a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro index e05b6b8..f6bc369 100644 --- a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro +++ b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -#QT = core +CONFIG += testcase + +TARGET = tst_qsystemsemaphore +QT += testlib +SOURCES += tst_qsystemsemaphore.cpp include(../qsharedmemory/src/src.pri) win32: CONFIG += console @@ -7,9 +10,6 @@ win32: CONFIG += console DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG -SOURCES += tst_qsystemsemaphore.cpp -TARGET = tst_qsystemsemaphore - RESOURCES += files.qrc wince*: { diff --git a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro index 830b3d7..26b70d1d 100644 --- a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro +++ b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qvideosurfaceformat +QT += multimedia testlib SOURCES += tst_qvideosurfaceformat.cpp -QT += multimedia requires(contains(QT_CONFIG, multimedia)) diff --git a/tests/auto/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro index 83b2a6d..0f5b297 100644 --- a/tests/auto/qwindowsurface/qwindowsurface.pro +++ b/tests/auto/qwindowsurface/qwindowsurface.pro @@ -1,7 +1,5 @@ CONFIG += testcase -TARGET = tst_qwindowsurface - -QT += widgets widgets-private testlib -QT += gui-private +TARGET = tst_qwindowsurface +QT += testlib SOURCES += tst_qwindowsurface.cpp diff --git a/tests/auto/qwineventnotifier/qwineventnotifier.pro b/tests/auto/qwineventnotifier/qwineventnotifier.pro index 62da3a3..7896c30 100644 --- a/tests/auto/qwineventnotifier/qwineventnotifier.pro +++ b/tests/auto/qwineventnotifier/qwineventnotifier.pro @@ -1,4 +1,6 @@ -load(qttest_p4) -SOURCES += tst_qwineventnotifier.cpp -QT = core +CONFIG += testcase + +TARGET = tst_qwineventnotifier +QT = core testlib +SOURCES += tst_qwineventnotifier.cpp CONFIG += parallel_test diff --git a/tests/auto/qwsembedwidget/qwsembedwidget.pro b/tests/auto/qwsembedwidget/qwsembedwidget.pro index 97cbf94..ff2b6e8 100644 --- a/tests/auto/qwsembedwidget/qwsembedwidget.pro +++ b/tests/auto/qwsembedwidget/qwsembedwidget.pro @@ -1,4 +1,5 @@ CONFIG += testcase + TARGET = tst_qwsembedwidget -QT += widgets testlib +QT += testlib SOURCES += tst_qwsembedwidget.cpp diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro index 3782644..5533660 100644 --- a/tests/auto/qx11info/qx11info.pro +++ b/tests/auto/qx11info/qx11info.pro @@ -1,4 +1,5 @@ CONFIG += testcase + TARGET = tst_qx11info -QT += widgets testlib +QT += testlib SOURCES += tst_qx11info.cpp diff --git a/tests/auto/qxmlitem/qxmlitem.pro b/tests/auto/qxmlitem/qxmlitem.pro index 54c8969..0afd674 100644 --- a/tests/auto/qxmlitem/qxmlitem.pro +++ b/tests/auto/qxmlitem/qxmlitem.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qxmlitem +QT += testlib SOURCES += tst_qxmlitem.cpp include (../xmlpatterns.pri) diff --git a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro index 73a5b00..cddda29 100644 --- a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro +++ b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qxmlnodemodelindex +QT += testlib SOURCES += tst_qxmlnodemodelindex.cpp include (../xmlpatterns.pri) diff --git a/tests/auto/qxmlresultitems/qxmlresultitems.pro b/tests/auto/qxmlresultitems/qxmlresultitems.pro index 7d74c20..6004e8e 100644 --- a/tests/auto/qxmlresultitems/qxmlresultitems.pro +++ b/tests/auto/qxmlresultitems/qxmlresultitems.pro @@ -1,4 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qxmlresultitems +QT += testlib SOURCES += tst_qxmlresultitems.cpp include (../xmlpatterns.pri) diff --git a/tests/auto/qxmlschema/qxmlschema.pro b/tests/auto/qxmlschema/qxmlschema.pro index f5abe4f..93238bc 100644 --- a/tests/auto/qxmlschema/qxmlschema.pro +++ b/tests/auto/qxmlschema/qxmlschema.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qxmlschema +QT += network testlib SOURCES += tst_qxmlschema.cpp -QT += network include (../xmlpatterns.pri) diff --git a/tests/auto/qzip/qzip.pro b/tests/auto/qzip/qzip.pro index 683da62..e8f26a4 100644 --- a/tests/auto/qzip/qzip.pro +++ b/tests/auto/qzip/qzip.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qzip +QT += testlib SOURCES += tst_qzip.cpp wince*|symbian: { diff --git a/tests/auto/uic/uic.pro b/tests/auto/uic/uic.pro index 355cb56..10444f6 100644 --- a/tests/auto/uic/uic.pro +++ b/tests/auto/uic/uic.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase -CONFIG += qtestlib -SOURCES += tst_uic.cpp TARGET = tst_uic +QT += qtestlib +SOURCES += tst_uic.cpp # This test is not run on wince (I think) DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro index 0ced633..3187999 100644 --- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro +++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_xmlpatternsxqts +QT += xml testlib SOURCES += tst_xmlpatternsxqts.cpp ../qxmlquery/TestFundament.cpp tst_suitetest.cpp include(../xmlpatterns.pri) @@ -16,8 +19,4 @@ INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private \ $$(QTDIR)/tools/xmlpatterns \ ../xmlpatternssdk/ -CONFIG += testlib -QT += xml -TARGET = tst_xmlpatternsxqts - requires(contains(QT_CONFIG,private_tests)) -- cgit v0.12 From 6974cc0a9ea2911a9ffd097f05955c1ca73e184a Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 29 Dec 2011 11:00:37 +0100 Subject: tests: eliminated usage of qttest_p4.prf [part 3] qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I65ba34a59db7aa15bc6304e690c825a4d6cd1037 Reviewed-by: Sergio Ahumada --- tests/auto/checkxmlfiles/checkxmlfiles.pro | 7 ++++--- .../auto/exceptionsafety_objects/exceptionsafety_objects.pro | 7 +++++-- tests/auto/moc/moc.pro | 12 ++++++------ tests/auto/qabstractproxymodel/qabstractproxymodel.pro | 5 ++++- tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro | 6 ++++-- tests/auto/qcopchannel/test/test.pro | 7 +++---- tests/auto/qcopchannel/testSend/testSend.pro | 7 ++++--- tests/auto/qcryptographichash/qcryptographichash.pro | 11 +++++++---- tests/auto/qdesktopservices/qdesktopservices.pro | 11 ++++++----- tests/auto/qfiledialog2/qfiledialog2.pro | 8 +++----- tests/auto/qfilesystementry/qfilesystementry.pro | 5 +++-- tests/auto/qgraphicsobject/qgraphicsobject.pro | 8 ++++++-- tests/auto/qgroupbox/qgroupbox.pro | 8 ++++---- tests/auto/qheaderview/qheaderview.pro | 7 ++++--- tests/auto/qhostinfo/qhostinfo.pro | 6 +++--- tests/auto/qlist/qlist.pro | 8 ++++---- tests/auto/qnetworkreply/test/test.pro | 10 +++++----- tests/auto/qnetworksession/test/test.pro | 8 ++++---- tests/auto/qpainter/qpainter.pro | 9 +++++++-- tests/auto/qpicture/qpicture.pro | 8 ++++---- tests/auto/qplugin/tst_qplugin.pro | 11 ++++++----- tests/auto/qprogressbar/qprogressbar.pro | 8 ++++---- tests/auto/qrawfont/qrawfont.pro | 8 ++++---- tests/auto/qspinbox/qspinbox.pro | 8 ++++---- tests/auto/qsqlerror/qsqlerror.pro | 9 +++------ tests/auto/qsqltablemodel/qsqltablemodel.pro | 12 ++++++------ tests/auto/qstyleoption/qstyleoption.pro | 11 +++-------- tests/auto/qsvgdevice/qsvgdevice.pro | 9 ++++----- tests/auto/qtabwidget/qtabwidget.pro | 9 +++++---- tests/auto/qtextodfwriter/qtextodfwriter.pro | 5 ++++- tests/auto/qxmlname/qxmlname.pro | 5 ++++- tests/auto/symbols/symbols.pro | 8 +++++--- tests/auto/uic/uic.pro | 2 +- 33 files changed, 143 insertions(+), 120 deletions(-) diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro index ab932f5..5bbfd6c 100644 --- a/tests/auto/checkxmlfiles/checkxmlfiles.pro +++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_checkxmlfiles +QT = core testlib SOURCES += tst_checkxmlfiles.cpp \ ../qxmlquery/TestFundament.cpp -CONFIG += qtestlib -QT -= gui include (../xmlpatterns.pri) diff --git a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro index 9ef634e..7912f83 100644 --- a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro +++ b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h +CONFIG += testcase + +TARGET = tst_exceptionsafety_objects +QT += testlib SOURCES += tst_exceptionsafety_objects.cpp +HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/moc/moc.pro b/tests/auto/moc/moc.pro index 4fb9ac4..f360a0b 100644 --- a/tests/auto/moc/moc.pro +++ b/tests/auto/moc/moc.pro @@ -1,4 +1,8 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_moc +QT += sql network svg testlib +SOURCES += tst_moc.cpp #exists(/usr/include/boost/spirit.hpp) { # message("including boost headers in test") @@ -18,14 +22,10 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n dir-in-include-path.h single_function_keyword.h task192552.h task189996.h \ task234909.h task240368.h pure-virtual-signals.h if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h -SOURCES += tst_moc.cpp -QT += sql network svg contains(QT_CONFIG, script): QT += script contains(QT_CONFIG, qt3support): QT += qt3support -contains(QT_CONFIG, dbus){ +contains(QT_CONFIG, dbus) { DEFINES += WITH_DBUS QT += dbus } - - diff --git a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro index d1bff92..f5dd43c 100644 --- a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro +++ b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro @@ -1,2 +1,5 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qabstractproxymodel +QT += testlib SOURCES += tst_qabstractproxymodel.cpp diff --git a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro index 080719a..8437274 100644 --- a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro +++ b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qabstractvideobuffer +QT += multimedia testlib SOURCES += tst_qabstractvideobuffer.cpp -QT += multimedia requires(contains(QT_CONFIG, multimedia)) diff --git a/tests/auto/qcopchannel/test/test.pro b/tests/auto/qcopchannel/test/test.pro index 8c7cc5b..db458f1 100644 --- a/tests/auto/qcopchannel/test/test.pro +++ b/tests/auto/qcopchannel/test/test.pro @@ -1,6 +1,5 @@ -load(qttest_p4) +CONFIG += testcase -SOURCES += ../tst_qcopchannel.cpp TARGET = ../tst_qcopchannel - - +QT += testlib +SOURCES += ../tst_qcopchannel.cpp diff --git a/tests/auto/qcopchannel/testSend/testSend.pro b/tests/auto/qcopchannel/testSend/testSend.pro index ebce3dd..8cd37bd 100644 --- a/tests/auto/qcopchannel/testSend/testSend.pro +++ b/tests/auto/qcopchannel/testSend/testSend.pro @@ -1,6 +1,7 @@ -load(qttest_p4) -SOURCES = main.cpp +CONFIG += testcase + TARGET = testSend +QT += testlib +SOURCES = main.cpp requires(embedded) - diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/qcryptographichash/qcryptographichash.pro index 65e31dc..7ce190a 100644 --- a/tests/auto/qcryptographichash/qcryptographichash.pro +++ b/tests/auto/qcryptographichash/qcryptographichash.pro @@ -1,9 +1,12 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qcryptographichash +QT = core testlib SOURCES += tst_qcryptographichash.cpp -QT = core symbian: { -TARGET.EPOCSTACKSIZE =0x5000 -TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb + TARGET.EPOCSTACKSIZE =0x5000 + TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } + CONFIG += parallel_test diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro index 43f6cba..4fe416c 100644 --- a/tests/auto/qdesktopservices/qdesktopservices.pro +++ b/tests/auto/qdesktopservices/qdesktopservices.pro @@ -1,7 +1,9 @@ -CONFIG += qttest_p4 +CONFIG += testcase + +TARGET = tst_qdesktopservices +QT += testlib +SOURCES += tst_qdesktopservices.cpp -SOURCES += tst_qdesktopservices.cpp -TARGET = tst_qdesktopservices symbian: { dummy.files = text\\testfile.txt dummy.path = . @@ -25,5 +27,4 @@ symbian: { # These are only needed for manual tests #DEPLOYMENT += dummy text - } - +} diff --git a/tests/auto/qfiledialog2/qfiledialog2.pro b/tests/auto/qfiledialog2/qfiledialog2.pro index b8924c1..dae8aaf 100644 --- a/tests/auto/qfiledialog2/qfiledialog2.pro +++ b/tests/auto/qfiledialog2/qfiledialog2.pro @@ -1,9 +1,7 @@ -############################################################ -# Project file for autotest for file qfiledialog.h -############################################################ - -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfiledialog2 +QT += testlib SOURCES += tst_qfiledialog2.cpp wince*|symbian { diff --git a/tests/auto/qfilesystementry/qfilesystementry.pro b/tests/auto/qfilesystementry/qfilesystementry.pro index b9b43e6..3604dea 100644 --- a/tests/auto/qfilesystementry/qfilesystementry.pro +++ b/tests/auto/qfilesystementry/qfilesystementry.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfilesystementry +QT = core testlib SOURCES += tst_qfilesystementry.cpp \ ../../../src/corelib/io/qfilesystementry.cpp HEADERS += ../../../src/corelib/io/qfilesystementry_p.h -QT = core CONFIG += parallel_test diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro index 2418845..7cc92c1 100644 --- a/tests/auto/qgraphicsobject/qgraphicsobject.pro +++ b/tests/auto/qgraphicsobject/qgraphicsobject.pro @@ -1,3 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qgraphicsobject +QT += testlib SOURCES += tst_qgraphicsobject.cpp -CONFIG += parallel_test \ No newline at end of file + +CONFIG += parallel_test diff --git a/tests/auto/qgroupbox/qgroupbox.pro b/tests/auto/qgroupbox/qgroupbox.pro index 5f5370f..c488c90 100644 --- a/tests/auto/qgroupbox/qgroupbox.pro +++ b/tests/auto/qgroupbox/qgroupbox.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qgroupbox.cpp - - +CONFIG += testcase +TARGET = tst_qgroupbox +QT += testlib +SOURCES += tst_qgroupbox.cpp diff --git a/tests/auto/qheaderview/qheaderview.pro b/tests/auto/qheaderview/qheaderview.pro index 3436d4f..c24bf83 100644 --- a/tests/auto/qheaderview/qheaderview.pro +++ b/tests/auto/qheaderview/qheaderview.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qheaderview.cpp - +CONFIG += testcase +TARGET = tst_qheaderview +QT += testlib +SOURCES += tst_qheaderview.cpp diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/qhostinfo/qhostinfo.pro index c9e7464..e43cf4e 100644 --- a/tests/auto/qhostinfo/qhostinfo.pro +++ b/tests/auto/qhostinfo/qhostinfo.pro @@ -1,9 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhostinfo +QT = core network testlib SOURCES += tst_qhostinfo.cpp -QT = core network - wince*: { LIBS += ws2.lib } else { diff --git a/tests/auto/qlist/qlist.pro b/tests/auto/qlist/qlist.pro index be599b7..470b3cc 100644 --- a/tests/auto/qlist/qlist.pro +++ b/tests/auto/qlist/qlist.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qlist.cpp - - +CONFIG += testcase +TARGET = tst_qlist +QT = core testlib +SOURCES += tst_qlist.cpp diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro index ce479d0..d52fcdb 100644 --- a/tests/auto/qnetworkreply/test/test.pro +++ b/tests/auto/qnetworkreply/test/test.pro @@ -1,19 +1,19 @@ -load(qttest_p4) -QT -= gui -SOURCES += ../tst_qnetworkreply.cpp +CONFIG += testcase + TARGET = ../tst_qnetworkreply +QT = core network testlib +SOURCES += ../tst_qnetworkreply.cpp win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qnetworkreply -} else { + } else { TARGET = ../../release/tst_qnetworkreply } } !symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\" -QT = core network RESOURCES += ../qnetworkreply.qrc symbian|wince*:{ diff --git a/tests/auto/qnetworksession/test/test.pro b/tests/auto/qnetworksession/test/test.pro index 645b061..15590e8 100644 --- a/tests/auto/qnetworksession/test/test.pro +++ b/tests/auto/qnetworksession/test/test.pro @@ -1,10 +1,10 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qnetworksession +QT = core network testlib SOURCES += tst_qnetworksession.cpp HEADERS += ../../qbearertestcommon.h -QT = core network - -TARGET = tst_qnetworksession CONFIG(debug_and_release) { CONFIG(debug, debug|release) { DESTDIR = ../debug diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro index 030b344..7762650 100644 --- a/tests/auto/qpainter/qpainter.pro +++ b/tests/auto/qpainter/qpainter.pro @@ -1,6 +1,11 @@ -load(qttest_p4) -contains(QT_CONFIG, qt3support): QT += qt3support +CONFIG += testcase + +TARGET = tst_qpainter +QT += testlib SOURCES += tst_qpainter.cpp + +contains(QT_CONFIG, qt3support): QT += qt3support + wince*|symbian: { addFiles.files = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png addFiles.path = . diff --git a/tests/auto/qpicture/qpicture.pro b/tests/auto/qpicture/qpicture.pro index 9979fe3..54e9222 100644 --- a/tests/auto/qpicture/qpicture.pro +++ b/tests/auto/qpicture/qpicture.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qpicture.cpp - - +CONFIG += testcase +TARGET = tst_qpicture +QT += testlib +SOURCES += tst_qpicture.cpp diff --git a/tests/auto/qplugin/tst_qplugin.pro b/tests/auto/qplugin/tst_qplugin.pro index 3629fb3..779d432 100644 --- a/tests/auto/qplugin/tst_qplugin.pro +++ b/tests/auto/qplugin/tst_qplugin.pro @@ -1,12 +1,13 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qplugin +QT = core testlib SOURCES = tst_qplugin.cpp -QT = core wince*: { - plugins.files = plugins/* - plugins.path = plugins - DEPLOYMENT += plugins + plugins.files = plugins/* + plugins.path = plugins + DEPLOYMENT += plugins } symbian: { diff --git a/tests/auto/qprogressbar/qprogressbar.pro b/tests/auto/qprogressbar/qprogressbar.pro index 6f0d772..985f159 100644 --- a/tests/auto/qprogressbar/qprogressbar.pro +++ b/tests/auto/qprogressbar/qprogressbar.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qprogressbar.cpp - - +CONFIG += testcase +TARGET = tst_qprogressbar +QT += testlib +SOURCES += tst_qprogressbar.cpp diff --git a/tests/auto/qrawfont/qrawfont.pro b/tests/auto/qrawfont/qrawfont.pro index ccdccfb..cfecfeb 100644 --- a/tests/auto/qrawfont/qrawfont.pro +++ b/tests/auto/qrawfont/qrawfont.pro @@ -1,8 +1,8 @@ -load(qttest_p4) -QT = core gui +CONFIG += testcase -SOURCES += \ - tst_qrawfont.cpp +TARGET = tst_qrawfont +QT = core gui testlib +SOURCES += tst_qrawfont.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src diff --git a/tests/auto/qspinbox/qspinbox.pro b/tests/auto/qspinbox/qspinbox.pro index a65554a..487224b 100644 --- a/tests/auto/qspinbox/qspinbox.pro +++ b/tests/auto/qspinbox/qspinbox.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qspinbox.cpp - - +CONFIG += testcase +TARGET = tst_qspinbox +QT += testlib +SOURCES += tst_qspinbox.cpp diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/qsqlerror/qsqlerror.pro index ebf6d24..7690324 100644 --- a/tests/auto/qsqlerror/qsqlerror.pro +++ b/tests/auto/qsqlerror/qsqlerror.pro @@ -1,10 +1,7 @@ -############################################################ -# Project file for autotest for file qsqlerror.h -############################################################ - -load(qttest_p4) -QT = core sql +CONFIG += testcase +TARGET = tst_qsqlerror +QT = core sql testlib SOURCES += tst_qsqlerror.cpp symbian { diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro index e49020f..e7e0d65 100644 --- a/tests/auto/qsqltablemodel/qsqltablemodel.pro +++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro @@ -1,14 +1,15 @@ -load(qttest_p4) -SOURCES += tst_qsqltablemodel.cpp +CONFIG += testcase -QT += sql +TARGET = tst_qsqltablemodel +QT = core sql testlib +SOURCES += tst_qsqltablemodel.cpp wince*: { plugFiles.files = ../../../plugins/sqldrivers plugFiles.path = . DEPLOYMENT += plugFiles LIBS += -lws2 -}else:symbian { +} else:symbian { qt_not_deployed { contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { sqlite.path = /sys/bin @@ -16,7 +17,6 @@ wince*: { DEPLOYMENT += sqlite } } -}else { +} else { win32:LIBS += -lws2_32 } - diff --git a/tests/auto/qstyleoption/qstyleoption.pro b/tests/auto/qstyleoption/qstyleoption.pro index 523d9b3..330b1f7 100644 --- a/tests/auto/qstyleoption/qstyleoption.pro +++ b/tests/auto/qstyleoption/qstyleoption.pro @@ -1,11 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.00a) ti 8. mar 16:20:21 2005 -###################################################################### +CONFIG += testcase -load(qttest_p4) +TARGET = tst_qstyleoption TEMPLATE = app - -# Input +QT += testlib SOURCES += tst_qstyleoption.cpp - - diff --git a/tests/auto/qsvgdevice/qsvgdevice.pro b/tests/auto/qsvgdevice/qsvgdevice.pro index 7eed6c8..388379a 100644 --- a/tests/auto/qsvgdevice/qsvgdevice.pro +++ b/tests/auto/qsvgdevice/qsvgdevice.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qsvgdevice.cpp -QT += xml - - +CONFIG += testcase +TARGET = tst_qsvgdevice +QT += xml testlib +SOURCES += tst_qsvgdevice.cpp diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/qtabwidget/qtabwidget.pro index 0c2fc66..1a2ffe0 100644 --- a/tests/auto/qtabwidget/qtabwidget.pro +++ b/tests/auto/qtabwidget/qtabwidget.pro @@ -1,11 +1,12 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qtabwidget +QT += testlib +SOURCES += tst_qtabwidget.cpp INCLUDEPATH += ../ HEADERS += -SOURCES += tst_qtabwidget.cpp contains(QT_CONFIG, qt3support): QT += qt3support win32:!wince*:LIBS += -luser32 - - diff --git a/tests/auto/qtextodfwriter/qtextodfwriter.pro b/tests/auto/qtextodfwriter/qtextodfwriter.pro index f5e2c09..ea1cebc 100644 --- a/tests/auto/qtextodfwriter/qtextodfwriter.pro +++ b/tests/auto/qtextodfwriter/qtextodfwriter.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qtextodfwriter +QT += testlib SOURCES += tst_qtextodfwriter.cpp !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qxmlname/qxmlname.pro b/tests/auto/qxmlname/qxmlname.pro index dd317a7..d5e3f69 100644 --- a/tests/auto/qxmlname/qxmlname.pro +++ b/tests/auto/qxmlname/qxmlname.pro @@ -1,4 +1,7 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_qxmlname +QT += testlib SOURCES += tst_qxmlname.cpp include (../xmlpatterns.pri) diff --git a/tests/auto/symbols/symbols.pro b/tests/auto/symbols/symbols.pro index f3bde3d..fd4c1d0 100644 --- a/tests/auto/symbols/symbols.pro +++ b/tests/auto/symbols/symbols.pro @@ -1,7 +1,9 @@ -load(qttest_p4) +CONFIG += testcase -cross_compile: DEFINES += QT_CROSS_COMPILED +TARGET = tst_symbols +QT = core testlib SOURCES += tst_symbols.cpp -QT = core + +cross_compile: DEFINES += QT_CROSS_COMPILED CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/uic/uic.pro b/tests/auto/uic/uic.pro index 10444f6..1dfeae6 100644 --- a/tests/auto/uic/uic.pro +++ b/tests/auto/uic/uic.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_uic -QT += qtestlib +QT += testlib SOURCES += tst_uic.cpp # This test is not run on wince (I think) -- cgit v0.12 From f99c17ef12c69990efb9eb18c1e83b91e07fe0ac Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Fri, 30 Dec 2011 11:34:22 +0100 Subject: Add a default alt attribute to img tags. The output HTML did not pass validation without a default alt attribute. Reviewed-by: Kevin Wright --- tools/qdoc3/htmlgenerator.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index bc84288..2a19681 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -759,6 +759,8 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << "\"""; helpProjectWriter->addExtraFile(fileName); if ((relative->type() == Node::Fake) && -- cgit v0.12 From 1e4c00f4a1844c040f24162844ed35d624ef59d2 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 29 Dec 2011 22:41:09 +0100 Subject: Doc: Add `-xunitxml' option to qtestlib documentation Task-number: QTBUG-14305 Reviewed-by: Casper van Donderen --- doc/src/development/qtestlib.qdoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index 80bf838..d0264f8 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -195,6 +195,8 @@ outputs XML formatted results instead of plain text \o \c -lightxml \BR outputs results as a stream of XML tags + \o \c -xunitxml \BR + outputs results as an Xunit XML document \o \c -eventdelay \e ms \BR if no delay is specified for keyboard or mouse simulation (\l QTest::keyClick(), -- cgit v0.12 From dd38c73dd4906d1ee32fc89be2fb072f50b01ee6 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Fri, 30 Dec 2011 15:01:32 +0100 Subject: Also correctly apply stack size difference in MSVC2008 The quotes around the stack size are not parsed correctly in MSVC2008, MSVC2010 accepts both the version with and without quotes. --- tools/qdoc3/qdoc3.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 254ba92..74a5fe0 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -15,9 +15,9 @@ qdoc_bootstrapped { CONFIG -= debug_and_release_target } -# Increase the stack size on MSVC to 4M to avoid a stack overflow +# Increase the stack size on MSVC to 4M to avoid a stack overflow win32-msvc*:{ -    QMAKE_LFLAGS += /STACK:\"4194304\" + QMAKE_LFLAGS += /STACK:4194304 } !isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin -- cgit v0.12 From 4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 31 Dec 2011 13:40:49 +0100 Subject: Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny" This reverts commit b070ad6a9804b6a7387f848c2e1721c16b8ccc62. Regarding the comments on b070ad6a9804b6a7387f848c2e1721c16b8ccc62 in 4.7, this should not be merged into 4.8 since the internals have changed. Conflicts: src/network/access/qnetworkaccesshttpbackend.cpp --- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 -------------------------- 1 file changed, 44 deletions(-) diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index ebf667f..371ac57 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -345,8 +345,6 @@ private Q_SLOTS: void getAndThenDeleteObject_data(); void getAndThenDeleteObject(); - void deleteManagerWhileGetIsInProgress(); - void symbianOpenCDataUrlCrash(); void getFromHttpIntoBuffer_data(); @@ -5661,48 +5659,6 @@ void tst_QNetworkReply::getAndThenDeleteObject() } } -void tst_QNetworkReply::deleteManagerWhileGetIsInProgress() -{ - // yes, this will leak if the testcase fails. I don't care. It must not fail then :P - QNetworkAccessManager *manager = new QNetworkAccessManager(); - QNetworkRequest request("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile"); - QNetworkReply *reply = manager->get(request); - reply->setReadBufferSize(1024); - - // Reset reply's parent to allow it to outlive the manager - reply->setParent(0); - - // Wait until a buffer is received - int totalWait = 0; - while (!reply->bytesAvailable()) { - QTest::qWait(20); - totalWait += 20; - QVERIFY( totalWait <= 5*1000); - } - - QVERIFY(reply->bytesAvailable()); - QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200); - QVERIFY(!reply->isFinished()); // must not be finished - - // Read the data to request next buffer's worth from the server - (void)reply->readAll(); - - QSignalSpy replyFinishedSpy(reply, SIGNAL(finished())); - - // Delete the manager - delete manager; - manager = 0; - - // Wait to allow reply to process any pending events - QTest::qWait(100); - - // The reply should be finished - QVERIFY(reply->isFinished()); - QCOMPARE(replyFinishedSpy.count(), 1); - - delete reply; -} - // see https://bugs.webkit.org/show_bug.cgi?id=38935 void tst_QNetworkReply::symbianOpenCDataUrlCrash() { -- cgit v0.12