AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile auto tests.
This commit is contained in:
Qt Continuous Integration System 2011-05-17 01:15:50 +10:00
commit eab70faca3
40 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/platformsocketengine/platformsocketengine.pro
View File

@ -7,7 +7,7 @@ requires(contains(QT_CONFIG,private_tests))
MOC_DIR=tmp MOC_DIR=tmp
QT = core network QT = core-private network-private
symbian { symbian {
TARGET.CAPABILITY = NetworkServices TARGET.CAPABILITY = NetworkServices

2
tests/auto/qauthenticator/qauthenticator.pro
View File

@ -1,5 +1,5 @@
load(qttest_p4) load(qttest_p4)
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
QT = core network QT = core network-private
SOURCES += tst_qauthenticator.cpp SOURCES += tst_qauthenticator.cpp
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"

1
tests/auto/qcolumnview/qcolumnview.pro
View File

@ -1,4 +1,5 @@
CONFIG += qttest_p4 CONFIG += qttest_p4
QT += gui-private core-private
SOURCES += tst_qcolumnview.cpp SOURCES += tst_qcolumnview.cpp
TARGET = tst_qcolumnview TARGET = tst_qcolumnview

1
tests/auto/qcombobox/qcombobox.pro
View File

@ -1,3 +1,4 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private core-private
SOURCES += tst_qcombobox.cpp SOURCES += tst_qcombobox.cpp

2
tests/auto/qcssparser/qcssparser.pro
View File

@ -1,6 +1,6 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qcssparser.cpp SOURCES += tst_qcssparser.cpp
QT += xml QT += xml gui-private
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
!symbian: { !symbian: {

2
tests/auto/qdbusmarshall/test/test.pro
View File

@ -3,7 +3,7 @@ SOURCES += ../tst_qdbusmarshall.cpp
TARGET = ../tst_qdbusmarshall TARGET = ../tst_qdbusmarshall
QT = core QT = core
QT += dbus QT += core-private dbus-private
LIBS += $$QT_LIBS_DBUS LIBS += $$QT_LIBS_DBUS
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS

1
tests/auto/qfiledialog/qfiledialog.pro
View File

@ -4,6 +4,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qfiledialog.cpp SOURCES += tst_qfiledialog.cpp
wince*|symbian { wince*|symbian {

2
tests/auto/qfileinfo/qfileinfo.pro
View File

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qfileinfo.cpp SOURCES += tst_qfileinfo.cpp
QT = core QT = core-private
RESOURCES += qfileinfo.qrc RESOURCES += qfileinfo.qrc

2
tests/auto/qfilesystemmodel/qfilesystemmodel.pro
View File

@ -1,6 +1,6 @@
CONFIG += qttest_p4 CONFIG += qttest_p4
QT = core gui QT = core-private gui
SOURCES += tst_qfilesystemmodel.cpp SOURCES += tst_qfilesystemmodel.cpp
TARGET = tst_qfilesystemmodel TARGET = tst_qfilesystemmodel

2
tests/auto/qgl/qgl.pro
View File

@ -4,7 +4,7 @@
load(qttest_p4) load(qttest_p4)
requires(contains(QT_CONFIG,opengl)) requires(contains(QT_CONFIG,opengl))
QT += opengl QT += opengl-private gui-private core-private
contains(QT_CONFIG,egl):DEFINES += QGL_EGL contains(QT_CONFIG,egl):DEFINES += QGL_EGL
win32:!wince*: DEFINES += QT_NO_EGL win32:!wince*: DEFINES += QT_NO_EGL

1
tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
View File

@ -1,3 +1,4 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicsanchorlayout.cpp SOURCES += tst_qgraphicsanchorlayout.cpp
CONFIG += parallel_test CONFIG += parallel_test

1
tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
View File

@ -1,3 +1,4 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicsanchorlayout1.cpp SOURCES += tst_qgraphicsanchorlayout1.cpp
CONFIG += parallel_test CONFIG += parallel_test

1
tests/auto/qgraphicsitem/qgraphicsitem.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicsitem.cpp SOURCES += tst_qgraphicsitem.cpp
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII

1
tests/auto/qgraphicsscene/qgraphicsscene.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicsscene.cpp SOURCES += tst_qgraphicsscene.cpp
RESOURCES += images.qrc RESOURCES += images.qrc
win32:!wince*: LIBS += -lUser32 win32:!wince*: LIBS += -lUser32

1
tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
QT += core-private gui-private
SOURCES += tst_qgraphicssceneindex.cpp SOURCES += tst_qgraphicssceneindex.cpp
CONFIG += parallel_test CONFIG += parallel_test

2
tests/auto/qhostinfo/qhostinfo.pro
View File

@ -2,7 +2,7 @@ load(qttest_p4)
SOURCES += tst_qhostinfo.cpp SOURCES += tst_qhostinfo.cpp
QT = core network QT = core-private network-private
wince*: { wince*: {
LIBS += ws2.lib LIBS += ws2.lib

2
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
View File

@ -3,7 +3,7 @@ SOURCES += tst_qhttpnetworkconnection.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
QT = core network QT = core-private network-private
symbian: TARGET.CAPABILITY = NetworkServices symbian: TARGET.CAPABILITY = NetworkServices
symbian: { symbian: {

2
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
View File

@ -3,5 +3,5 @@ SOURCES += tst_qhttpnetworkreply.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
QT = core network QT = core-private network-private
symbian: TARGET.CAPABILITY = NetworkServices symbian: TARGET.CAPABILITY = NetworkServices

2
tests/auto/qhttpsocketengine/qhttpsocketengine.pro
View File

@ -6,7 +6,7 @@ include(../platformsocketengine/platformsocketengine.pri)
MOC_DIR=tmp MOC_DIR=tmp
QT = core network QT = core-private network-private
symbian: TARGET.CAPABILITY = NetworkServices symbian: TARGET.CAPABILITY = NetworkServices

1
tests/auto/qlistwidget/qlistwidget.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qlistwidget.cpp SOURCES += tst_qlistwidget.cpp

2
tests/auto/qmainwindow/qmainwindow.pro
View File

@ -1,6 +1,6 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qmainwindow.cpp SOURCES += tst_qmainwindow.cpp
QT += gui-private
# Symbian toolchain does not support correct include semantics # Symbian toolchain does not support correct include semantics
symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private

2
tests/auto/qnetworkreply/test/test.pro
View File

@ -13,7 +13,7 @@ win32 {
!symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\" !symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\"
QT = core network QT = core-private network-private
RESOURCES += ../qnetworkreply.qrc RESOURCES += ../qnetworkreply.qrc
symbian|wince*:{ symbian|wince*:{

3
tests/auto/qobject/tst_qobject.pro
View File

@ -7,7 +7,8 @@ SOURCES += moc_oldnormalizeobject.cpp
QT = core \ QT = core \
network \ network \
gui gui \
core-private
wince*: { wince*: {
addFiles.files = signalbug.exe addFiles.files = signalbug.exe
addFiles.path = . addFiles.path = .

1
tests/auto/qpathclipper/qpathclipper.pro
View File

@ -2,6 +2,7 @@ load(qttest_p4)
INCLUDEPATH += . INCLUDEPATH += .
HEADERS += paths.h HEADERS += paths.h
SOURCES += tst_qpathclipper.cpp paths.cpp SOURCES += tst_qpathclipper.cpp paths.cpp
QT += gui-private
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))

1
tests/auto/qpixmapcache/qpixmapcache.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_qpixmapcache.cpp SOURCES += tst_qpixmapcache.cpp

1
tests/auto/qsidebar/qsidebar.pro
View File

@ -1,5 +1,6 @@
CONFIG += qttest_p4 CONFIG += qttest_p4
QT += core-private
SOURCES += tst_qsidebar.cpp SOURCES += tst_qsidebar.cpp
TARGET = tst_qsidebar TARGET = tst_qsidebar

2
tests/auto/qsocketnotifier/qsocketnotifier.pro
View File

@ -1,6 +1,6 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qsocketnotifier.cpp SOURCES += tst_qsocketnotifier.cpp
QT = core network QT = core-private network-private
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))

4
tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
View File

@ -57,7 +57,7 @@
#include <private/qnet_unix_p.h> #include <private/qnet_unix_p.h>
#endif #endif
#include <limits> #include <limits>
#include <select.h> #include <sys/select.h>
class tst_QSocketNotifier : public QObject class tst_QSocketNotifier : public QObject
{ {
@ -180,7 +180,7 @@ void tst_QSocketNotifier::unexpectedDisconnection()
// we have to wait until sequence value changes // we have to wait until sequence value changes
// as any event can make us jump out processing // as any event can make us jump out processing
QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
QVERIFY(timer.isActive); //escape if test would hang QVERIFY(timer.isActive()); //escape if test would hang
} while(tester.sequence <= 0); } while(tester.sequence <= 0);
QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState); QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState);

2
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
View File

@ -7,7 +7,7 @@ include(../platformsocketengine/platformsocketengine.pri)
MOC_DIR=tmp MOC_DIR=tmp
QT = core network QT = core-private network-private
# Symbian toolchain does not support correct include semantics # Symbian toolchain does not support correct include semantics
symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private

2
tests/auto/qsslsocket/qsslsocket.pro
View File

@ -2,7 +2,7 @@ load(qttest_p4)
SOURCES += tst_qsslsocket.cpp SOURCES += tst_qsslsocket.cpp
!wince*:win32:LIBS += -lws2_32 !wince*:win32:LIBS += -lws2_32
QT += network QT += core-private network-private
QT -= gui QT -= gui
TARGET = tst_qsslsocket TARGET = tst_qsslsocket

2
tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
View File

@ -2,7 +2,7 @@ load(qttest_p4)
SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp
!wince*:win32:LIBS += -lws2_32 !wince*:win32:LIBS += -lws2_32
QT += network QT += core-private network-private
QT -= gui QT -= gui
TARGET = tst_qsslsocket_onDemandCertificates_member TARGET = tst_qsslsocket_onDemandCertificates_member

2
tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
View File

@ -2,7 +2,7 @@ load(qttest_p4)
SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp
!wince*:win32:LIBS += -lws2_32 !wince*:win32:LIBS += -lws2_32
QT += network QT += core-private network-private
QT -= gui QT -= gui
TARGET = tst_qsslsocket_onDemandCertificates_static TARGET = tst_qsslsocket_onDemandCertificates_static

2
tests/auto/qstylesheetstyle/qstylesheetstyle.pro
View File

@ -1,5 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
# Input # Input
SOURCES += tst_qstylesheetstyle.cpp SOURCES += tst_qstylesheetstyle.cpp
RESOURCES += resources.qrc RESOURCES += resources.qrc

1
tests/auto/qtcpsocket/test/test.pro
View File

@ -1,5 +1,6 @@
load(qttest_p4) load(qttest_p4)
QT += core-private network-private
SOURCES += ../tst_qtcpsocket.cpp SOURCES += ../tst_qtcpsocket.cpp
win32: { win32: {
wince*: { wince*: {

1
tests/auto/qtextedit/qtextedit.pro
View File

@ -1,5 +1,6 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
INCLUDEPATH += ../ INCLUDEPATH += ../
HEADERS += HEADERS +=

1
tests/auto/qtextlayout/qtextlayout.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
HEADERS += HEADERS +=
SOURCES += tst_qtextlayout.cpp SOURCES += tst_qtextlayout.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src

1
tests/auto/qtextpiecetable/qtextpiecetable.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qtextpiecetable.cpp SOURCES += tst_qtextpiecetable.cpp
HEADERS += ../qtextdocument/common.h HEADERS += ../qtextdocument/common.h

2
tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
View File

@ -1,5 +1,5 @@
CONFIG += qttest_p4 CONFIG += qttest_p4
#QT = core QT += gui-private
include(../src/src.pri) include(../src/src.pri)
win32: CONFIG += console win32: CONFIG += console

1
tests/auto/qtipc/qsharedmemory/src/src.pri
View File

@ -1,5 +1,6 @@
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
QT += core-private
SOURCES += $$PWD/qsystemlock.cpp SOURCES += $$PWD/qsystemlock.cpp

1
tests/auto/qtoolbar/qtoolbar.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_qtoolbar.cpp SOURCES += tst_qtoolbar.cpp