diff options
274 files changed, 624 insertions, 440 deletions
@@ -6231,6 +6231,11 @@ if [ "$PLATFORM_MAC" = "yes" ]; then CFG_COREWLAN=no fi fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + QT_CONFIG="$QT_CONFIG coreservices" + else + QMakeVar add DEFINES QT_NO_CORESERVICES + fi fi @@ -6339,13 +6344,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then QT_CONFIG="$QT_CONFIG wayland" fi - - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then - QT_CONFIG="$QT_CONFIG coreservices" - else - QMakeVar add DEFINES QT_NO_CORESERVICES - fi - fi diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 4961722..781a5f0 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -1058,22 +1058,24 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla TInt nativeMapError = KErrNone; RFileMap mapping; TUint mode(EFileMapRemovableMedia); + TUint64 nativeOffset = offset & ~(mapping.PageSizeInBytes() - 1); + //If the file was opened for write or read/write, then open the map for read/write if (openMode & QIODevice::WriteOnly) mode |= EFileMapWrite; if (symbianFile.SubSessionHandle()) { - nativeMapError = mapping.Open(symbianFile, offset, size, mode); + nativeMapError = mapping.Open(symbianFile, nativeOffset, size, mode); } else { //map file by name if we don't have a native handle QString fn = QFileSystemEngine::absoluteName(fileEntry).nativeFilePath(); TUint filemode = EFileShareReadersOrWriters | EFileRead; if (openMode & QIODevice::WriteOnly) filemode |= EFileWrite; - nativeMapError = mapping.Open(qt_s60GetRFs(), qt_QString2TPtrC(fn), filemode, offset, size, mode); + nativeMapError = mapping.Open(qt_s60GetRFs(), qt_QString2TPtrC(fn), filemode, nativeOffset, size, mode); } if (nativeMapError == KErrNone) { QScopedResource<RFileMap> ptr(mapping); //will call Close if adding to mapping throws an exception - uchar *address = mapping.Base(); + uchar *address = mapping.Base() + (offset - nativeOffset); maps[address] = mapping; ptr.take(); return address; 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/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 587c0f2..1518d2d 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -552,11 +552,13 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) // the control's window qwidget->d_func()->createExtra(); - SetFocusing(true); - m_longTapDetector = QLongTapTimer::NewL(this); - m_doubleClickTimer.invalidate(); + if (!qwidget->d_func()->isGLGlobalShareWidget) { + SetFocusing(true); + m_longTapDetector = QLongTapTimer::NewL(this); + m_doubleClickTimer.invalidate(); - DrawableWindow()->SetPointerGrab(ETrue); + DrawableWindow()->SetPointerGrab(ETrue); + } } #ifdef Q_SYMBIAN_TRANSITION_EFFECTS @@ -590,25 +592,27 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) QSymbianControl::~QSymbianControl() { - // Ensure backing store is deleted before the top-level - // window is destroyed - QT_TRY { - qt_widget_private(qwidget)->topData()->backingStore.destroy(); - } QT_CATCH(const std::exception&) { - // ignore exceptions, nothing can be done - } - - if (S60->curWin == this) - S60->curWin = 0; - if (!QApplicationPrivate::is_app_closing) { + if (!qwidget->d_func()->isGLGlobalShareWidget) { // GLGlobalShareWidget doesn't interact with scene + // Ensure backing store is deleted before the top-level + // window is destroyed QT_TRY { - setFocusSafely(false); + qt_widget_private(qwidget)->topData()->backingStore.destroy(); } QT_CATCH(const std::exception&) { // ignore exceptions, nothing can be done } + + if (S60->curWin == this) + S60->curWin = 0; + if (!QApplicationPrivate::is_app_closing) { + QT_TRY { + setFocusSafely(false); + } QT_CATCH(const std::exception&) { + // ignore exceptions, nothing can be done + } + } + S60->appUi()->RemoveFromStack(this); + delete m_longTapDetector; } - S60->appUi()->RemoveFromStack(this); - delete m_longTapDetector; } void QSymbianControl::setWidget(QWidget *w) @@ -826,7 +830,8 @@ void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent) const TPointerEvent *pointerEvent = eventData.Pointer(i); const TAdvancedPointerEvent *advEvent = pointerEvent->AdvancedPointerEvent(); if (!advEvent || advEvent->PointerNumber() == 0) { - m_longTapDetector->PointerEventL(*pointerEvent); + if (m_longTapDetector) + m_longTapDetector->PointerEventL(*pointerEvent); QT_TRYCATCH_LEAVING(HandlePointerEvent(*pointerEvent)); } } @@ -843,8 +848,8 @@ void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent) } } #endif - - m_longTapDetector->PointerEventL(pEvent); + if (m_longTapDetector) + m_longTapDetector->PointerEventL(pEvent); QT_TRYCATCH_LEAVING(HandlePointerEvent(pEvent)); } @@ -1535,6 +1540,10 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) if (m_ignoreFocusChanged || (qwidget->windowType() & Qt::WindowType_Mask) == Qt::Desktop) return; + // just in case + if (qwidget->d_func()->isGLGlobalShareWidget) + return; + #ifdef Q_WS_S60 if (S60->splitViewLastWidget) return; @@ -1710,7 +1719,8 @@ void QSymbianControl::HandleResourceChange(int resourceType) } void QSymbianControl::CancelLongTapTimer() { - m_longTapDetector->Cancel(); + if (m_longTapDetector) + m_longTapDetector->Cancel(); } TTypeUid::Ptr QSymbianControl::MopSupplyObject(TTypeUid id) @@ -1723,6 +1733,9 @@ TTypeUid::Ptr QSymbianControl::MopSupplyObject(TTypeUid id) void QSymbianControl::setFocusSafely(bool focus) { + if (qwidget->d_func()->isGLGlobalShareWidget) + return; + // The stack hack in here is very unfortunate, but it is the only way to ensure proper // focus in Symbian. If this is not executed, the control which happens to be on // the top of the stack may randomly be assigned focus by Symbian, for example diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 7055c6b..bceda66 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -314,6 +314,7 @@ QWidgetPrivate::QWidgetPrivate(int version) #elif defined(Q_OS_SYMBIAN) , symbianScreenNumber(0) , fixNativeOrientationCalled(false) + , isGLGlobalShareWidget(0) #endif { if (!qApp) { diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 9ac9479..94c1d63 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -916,6 +916,7 @@ public: void reparentChildren(); void registerTouchWindow(); QList<WId> widCleanupList; + uint isGLGlobalShareWidget : 1; #endif }; diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index a37c265..fefa781 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -393,16 +393,18 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de stackingFlags = ECoeStackFlagStandard; } control->MakeVisible(false); - QT_TRAP_THROWING(control->ControlEnv()->AppUi()->AddToStackL(control.data(), ECoeStackPriorityDefault, stackingFlags)); - // Avoid keyboard focus to a hidden window. - control->setFocusSafely(false); - RDrawableWindow *const drawableWindow = control->DrawableWindow(); - // Request mouse move events. - drawableWindow->PointerFilter(EPointerFilterEnterExit - | EPointerFilterMove | EPointerFilterDrag, 0); - drawableWindow->EnableVisibilityChangeEvents(); + if (!isGLGlobalShareWidget) { + QT_TRAP_THROWING(control->ControlEnv()->AppUi()->AddToStackL(control.data(), ECoeStackPriorityDefault, stackingFlags)); + // Avoid keyboard focus to a hidden window. + control->setFocusSafely(false); + RDrawableWindow *const drawableWindow = control->DrawableWindow(); + // Request mouse move events. + drawableWindow->PointerFilter(EPointerFilterEnterExit + | EPointerFilterMove | EPointerFilterDrag, 0); + drawableWindow->EnableVisibilityChangeEvents(); + } } q->setAttribute(Qt::WA_WState_Created); 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/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 2fc1dbd..71cb0e7 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2912,7 +2912,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; } diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 872b19c..652bcbd 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -451,11 +451,7 @@ init_context: if (!ace.isEmpty() && !QHostAddress().setAddress(tlsHostName) && !(configuration.sslOptions & QSsl::SslOptionDisableServerNameIndication)) { -#if OPENSSL_VERSION_NUMBER >= 0x10000000L if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.data())) -#else - if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.constData())) -#endif qWarning("could not set SSL_CTRL_SET_TLSEXT_HOSTNAME, Server Name Indication disabled"); } } diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 51ecf5d..f01f66e 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -210,11 +210,7 @@ DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return) #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) -#else -DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, const void *parg, parg, return -1, return) -#endif #endif DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return) DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, BIO *c, c, return, DUMMYARG) diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h index 0381c4f..29934d1 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -318,11 +318,7 @@ int q_SSL_library_init(); void q_SSL_load_error_strings(); SSL *q_SSL_new(SSL_CTX *a); #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg); -#else -long q_SSL_ctrl(SSL *ssl,int cmd, long larg, const void *parg); -#endif #endif int q_SSL_read(SSL *a, void *b, int c); void q_SSL_set_bio(SSL *a, BIO *b, BIO *c); diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index df09dfd..89153d9 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -106,6 +106,10 @@ class QMacWindowChangeEvent; class QWSGLWindowSurface; #endif +#ifdef Q_OS_SYMBIAN +extern bool qt_initializing_gl_share_widget(); +#endif + #ifndef QT_NO_EGL class QEglContext; #endif @@ -183,6 +187,10 @@ public: #endif { isGLWidget = 1; +#if defined(Q_OS_SYMBIAN) + if (qt_initializing_gl_share_widget()) + isGLGlobalShareWidget = 1; +#endif } ~QGLWidgetPrivate() {} diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index a15084b..d512946 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -184,28 +184,29 @@ QGLGraphicsSystem::QGLGraphicsSystem(bool useX11GL) class QGLGlobalShareWidget { public: - QGLGlobalShareWidget() : widget(0), initializing(false) { + QGLGlobalShareWidget() : widget(0), init(false) { created = true; } QGLWidget *shareWidget() { - if (!initializing && !widget && !cleanedUp) { - initializing = true; + if (!init && !widget && !cleanedUp) { + init = true; widget = new QGLWidget(QGLFormat(QGL::SingleBuffer | QGL::NoDepthBuffer | QGL::NoStencilBuffer)); #ifdef Q_OS_SYMBIAN if (!widget->context()->isValid()) { delete widget; widget = 0; - initializing = false; + init = false; return 0; } #endif + widget->resize(1, 1); // We don't need this internal widget to appear in QApplication::topLevelWidgets() if (QWidgetPrivate::allWidgets) QWidgetPrivate::allWidgets->remove(widget); - initializing = false; + init = false; } return widget; } @@ -232,12 +233,17 @@ public: cleanedUp = false; } + bool initializing() + { + return init; + } + static bool cleanedUp; static bool created; private: QGLWidget *widget; - bool initializing; + bool init; }; bool QGLGlobalShareWidget::cleanedUp = false; @@ -268,6 +274,13 @@ void qt_destroy_gl_share_widget() _qt_gl_share_widget()->destroy(); } +bool qt_initializing_gl_share_widget() +{ + if (QGLGlobalShareWidget::created) + return _qt_gl_share_widget()->initializing(); + return false; +} + const QGLContext *qt_gl_share_context() { QGLWidget *widget = qt_gl_share_widget(); diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h index 91d1f9e..6c8b71f 100644 --- a/src/opengl/qwindowsurface_gl_p.h +++ b/src/opengl/qwindowsurface_gl_p.h @@ -68,6 +68,7 @@ struct QGLWindowSurfacePrivate; Q_OPENGL_EXPORT QGLWidget* qt_gl_share_widget(); Q_OPENGL_EXPORT void qt_destroy_gl_share_widget(); +bool qt_initializing_gl_share_widget(); class QGLWindowSurfaceGLPaintDevice : public QGLPaintDevice { 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/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/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/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/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/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/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/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/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/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..cdfba9c 100644 --- a/tests/auto/qabstractfileengine/qabstractfileengine.pro +++ b/tests/auto/qabstractfileengine/qabstractfileengine.pro @@ -1,6 +1,8 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qabstractfileengine +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/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/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/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/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/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/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/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/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 } 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 <QtGui/QMacStyle> #endif +#if defined(Q_OS_SYMBIAN) +# define SRCDIR "." +#endif + //TESTED_CLASS= //TESTED_FILES= 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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) { 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/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/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/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/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 53020eb..6bed9ff 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 } } @@ -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 3452a92..6a649ab 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 } } @@ -26,3 +26,5 @@ wince* { } requires(contains(QT_CONFIG,private_tests)) + +CONFIG+=insignificant_test # QTQAINFRA-428 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/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/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/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/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/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/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/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/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/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() 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/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..8b0229a 100644 --- a/tests/auto/qtimeline/qtimeline.pro +++ b/tests/auto/qtimeline/qtimeline.pro @@ -1,5 +1,7 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qtimeline +QT = core testlib SOURCES += tst_qtimeline.cpp -QT = core CONFIG += parallel_test + +CONFIG+=insignificant_test # QTQAINFRA-428 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/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/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/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/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/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/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/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/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/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/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/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/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/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 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/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/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 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 |