From 46d2d05e3a95eefae1c72f55d57cbea4ce27d14e Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Wed, 10 Nov 2010 14:18:08 +0100 Subject: Support glyph subpixel positioning without subpixel rendering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously subpixel positioning was only used when subpixel rendering is enabled (glyphType == Raster_RGBMask), however, it does not necessarily require that and for Mac OS X it will keep using subpixel positioning even when LCD font smoothing (subpixel rendering) is turned off. To maintain consistency when switching to raster, we should support subpixel positioning in this case. Task-number: QTBUG-5053 Reviewed-by: Jørgen Lind --- src/gui/painting/qtextureglyphcache.cpp | 2 +- src/gui/text/qfontengine.cpp | 5 +++++ src/gui/text/qfontengine_mac.mm | 4 ++-- src/gui/text/qfontengine_p.h | 3 ++- tests/auto/qpainter/tst_qpainter.cpp | 26 -------------------------- 5 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 78c1019..4a6c03f 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -312,7 +312,7 @@ QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g, QFixed subPixelPosition if (m_type == QFontEngineGlyphCache::Raster_RGBMask) return m_current_fontengine->alphaRGBMapForGlyph(g, subPixelPosition, glyphMargin(), m_transform); else - return m_current_fontengine->alphaMapForGlyph(g, m_transform); + return m_current_fontengine->alphaMapForGlyph(g, subPixelPosition, m_transform); return QImage(); } diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index f73b816..816c14a 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -607,6 +607,11 @@ void QFontEngine::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int n QImage QFontEngine::alphaMapForGlyph(glyph_t glyph, const QTransform &t) { + return alphaMapForGlyph(glyph, 0, t); +} + +QImage QFontEngine::alphaMapForGlyph(glyph_t glyph, QFixed /*subPixelPosition*/, const QTransform &t) +{ QImage i = alphaMapForGlyph(glyph); if (t.type() > QTransform::TxTranslate) i = i.transformed(t).convertToFormat(QImage::Format_Indexed8); diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index ebc1f6d..cebd1f5 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -713,9 +713,9 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition return im; } -QImage QCoreTextFontEngine::alphaMapForGlyph(glyph_t glyph) +QImage QCoreTextFontEngine::alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) { - QImage im = imageForGlyph(glyph, QFixed(), 0, false); + QImage im = imageForGlyph(glyph, subPixelPosition, 0, false); QImage indexed(im.width(), im.height(), QImage::Format_Indexed8); QVector colors(256); diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 6d6daaa..061bcfd 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -197,6 +197,7 @@ public: */ virtual QImage alphaMapForGlyph(glyph_t); virtual QImage alphaMapForGlyph(glyph_t, const QTransform &t); + virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t); virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, int margin, const QTransform &t); virtual glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, const QTransform &matrix, GlyphFormat /*format*/) @@ -473,7 +474,7 @@ public: virtual FaceId faceId() const; virtual bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const; virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics); - virtual QImage alphaMapForGlyph(glyph_t); + virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t); virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, int margin, const QTransform &t); virtual qreal minRightBearing() const; virtual qreal minLeftBearing() const; diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index 42303d2..219f920 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -4581,32 +4581,6 @@ void tst_QPainter::drawText_subPixelPositionsInRaster_qtbug5053() #if !defined(Q_WS_MAC) || !defined(QT_MAC_USE_COCOA) QSKIP("Only Mac/Cocoa supports sub pixel positions in raster engine currently", SkipAll); #endif - - int w = 10, h = 10; - QImage image(w, h, QImage::Format_RGB32); - image.fill(0xffffffff); - QPainter p(&image); - p.drawText(0, h, "X\\"); - p.end(); - - bool foundNonGrayPixel = false; - const int *bits = (const int *) ((const QImage &) image).bits(); - int bpl = image.bytesPerLine() / 4; - for (int y=0; yfont()); QImage baseLine(fm.width(QChar::fromLatin1('e')), fm.height(), QImage::Format_RGB32); -- cgit v0.12 From 27fe0f93f961e78b71cd0b729a0e324b847ec023 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 10 Nov 2010 17:02:02 +0100 Subject: Fix crash in tst_QByteArray::qUncompress On 64-bit systems, len + sizeof(QByteArray::Data) could overflow and become 0 In this case, qRealloc could succeed and return 0, leading to a double free. Reviewed-by: Joao --- src/corelib/tools/qbytearray.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index dc2e8e9..68789d9 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -541,6 +541,11 @@ QByteArray qUncompress(const uchar* data, int nbytes) forever { ulong alloc = len; + if (len >= (2 << 31) - sizeof(QByteArray::Data)) { + //QByteArray does not support that huge size anyway. + qWarning("qUncompress: Input data is corrupted"); + return QByteArray(); + } QByteArray::Data *p = static_cast(qRealloc(d.data(), sizeof(QByteArray::Data) + alloc)); if (!p) { // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS @@ -556,6 +561,11 @@ QByteArray qUncompress(const uchar* data, int nbytes) switch (res) { case Z_OK: if (len != alloc) { + if (len >= (2 << 31) - sizeof(QByteArray::Data)) { + //QByteArray does not support that huge size anyway. + qWarning("qUncompress: Input data is corrupted"); + return QByteArray(); + } QByteArray::Data *p = static_cast(qRealloc(d.data(), sizeof(QByteArray::Data) + len)); if (!p) { // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS -- cgit v0.12 From 61d9fe38961a411be1f5d6b5a593a9a205277d4b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 10 Nov 2010 16:14:01 +0100 Subject: QtCore autotests: make them paralelized. The filesystem autotests are not paralized (because i was scary) For reference, script I used: cat corelib.pro | grep -v "=" | grep \\\\ | cut -f1 -d\\ | sed "s/\(.*\) /\1/" | grep -v file | xargs -I{} echo "echo CONFIG += parallel_test >> {}/{}.pro" > t . t Reviexed-by: Joao --- tests/auto/collections/collections.pro | 1 + tests/auto/exceptionsafety/exceptionsafety.pro | 1 + tests/auto/q_func_info/q_func_info.pro | 1 + tests/auto/qanimationgroup/qanimationgroup.pro | 1 + tests/auto/qatomicint/qatomicint.pro | 1 + tests/auto/qatomicpointer/qatomicpointer.pro | 1 + tests/auto/qbitarray/qbitarray.pro | 1 + tests/auto/qbuffer/qbuffer.pro | 1 + tests/auto/qbytearray/qbytearray.pro | 1 + tests/auto/qbytearraymatcher/qbytearraymatcher.pro | 1 + tests/auto/qcache/qcache.pro | 1 + tests/auto/qchar/qchar.pro | 1 + tests/auto/qcontiguouscache/qcontiguouscache.pro | 1 + tests/auto/qcoreapplication/qcoreapplication.pro | 1 + tests/auto/qcryptographichash/qcryptographichash.pro | 1 + tests/auto/qdate/qdate.pro | 1 + tests/auto/qdatetime/qdatetime.pro | 1 + tests/auto/qdebug/qdebug.pro | 1 + tests/auto/qdiriterator/qdiriterator.pro | 1 + tests/auto/qeasingcurve/qeasingcurve.pro | 1 + tests/auto/qelapsedtimer/qelapsedtimer.pro | 1 + tests/auto/qevent/qevent.pro | 1 + .../auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro | 1 + tests/auto/qflags/qflags.pro | 1 + tests/auto/qfuture/qfuture.pro | 1 + tests/auto/qfuturewatcher/qfuturewatcher.pro | 1 + tests/auto/qgetputenv/qgetputenv.pro | 1 + tests/auto/qglobal/qglobal.pro | 1 + tests/auto/qhash/qhash.pro | 1 + tests/auto/qlibrary/qlibrary.pro | 1 + tests/auto/qline/qline.pro | 1 + tests/auto/qmap/qmap.pro | 1 + tests/auto/qmargins/qmargins.pro | 1 + tests/auto/qmath/qmath.pro | 1 + tests/auto/qmetatype/qmetatype.pro | 1 + tests/auto/qmutex/qmutex.pro | 1 + tests/auto/qmutexlocker/qmutexlocker.pro | 1 + tests/auto/qnumeric/qnumeric.pro | 1 + tests/auto/qobject/qobject.pro | 1 + tests/auto/qobjectrace/qobjectrace.pro | 1 + tests/auto/qplugin/qplugin.pro | 1 + tests/auto/qpluginloader/qpluginloader.pro | 1 + tests/auto/qpoint/qpoint.pro | 1 + tests/auto/qprocessenvironment/qprocessenvironment.pro | 1 + tests/auto/qqueue/qqueue.pro | 1 + tests/auto/qrand/qrand.pro | 1 + tests/auto/qreadlocker/qreadlocker.pro | 1 + tests/auto/qreadwritelock/qreadwritelock.pro | 1 + tests/auto/qrect/qrect.pro | 1 + tests/auto/qregexp/qregexp.pro | 1 + tests/auto/qresourceengine/qresourceengine.pro | 1 + tests/auto/qringbuffer/qringbuffer.pro | 1 + tests/auto/qscopedpointer/qscopedpointer.pro | 1 + tests/auto/qsemaphore/qsemaphore.pro | 1 + tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro | 1 + tests/auto/qset/qset.pro | 1 + tests/auto/qsharedpointer/qsharedpointer.pro | 1 + tests/auto/qsignalspy/qsignalspy.pro | 1 + tests/auto/qsize/qsize.pro | 1 + tests/auto/qsizef/qsizef.pro | 1 + tests/auto/qstate/qstate.pro | 1 + tests/auto/qstl/qstl.pro | 1 + tests/auto/qstring/qstring.pro | 1 + tests/auto/qstringbuilder1/qstringbuilder1.pro | 1 + tests/auto/qstringbuilder2/qstringbuilder2.pro | 1 + tests/auto/qstringbuilder3/qstringbuilder3.pro | 1 + tests/auto/qstringbuilder4/qstringbuilder4.pro | 1 + tests/auto/qstringlist/qstringlist.pro | 1 + tests/auto/qstringmatcher/qstringmatcher.pro | 1 + tests/auto/qstringref/qstringref.pro | 1 + tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro | 2 ++ tests/auto/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro | 2 ++ tests/auto/qtconcurrentmap/qtconcurrentmap.pro | 2 ++ tests/auto/qtconcurrentrun/qtconcurrentrun.pro | 2 ++ tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro | 2 ++ tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro | 1 + tests/auto/qthread/qthread.pro | 1 + tests/auto/qthreadonce/qthreadonce.pro | 1 + tests/auto/qthreadpool/qthreadpool.pro | 1 + tests/auto/qthreadstorage/qthreadstorage.pro | 1 + tests/auto/qtime/qtime.pro | 1 + tests/auto/qtimeline/qtimeline.pro | 1 + tests/auto/qtimer/qtimer.pro | 1 + tests/auto/qtmd5/qtmd5.pro | 1 + tests/auto/qtokenautomaton/qtokenautomaton.pro | 1 + tests/auto/qurl/qurl.pro | 1 + tests/auto/quuid/quuid.pro | 1 + tests/auto/qvarlengtharray/qvarlengtharray.pro | 1 + tests/auto/qvector/qvector.pro | 1 + tests/auto/qwaitcondition/qwaitcondition.pro | 1 + tests/auto/qwineventnotifier/qwineventnotifier.pro | 1 + tests/auto/qwritelocker/qwritelocker.pro | 1 + tests/auto/selftests/selftests.pro | 1 + tests/auto/utf8/utf8.pro | 1 + 94 files changed, 99 insertions(+) diff --git a/tests/auto/collections/collections.pro b/tests/auto/collections/collections.pro index 876e903..8601ff8 100644 --- a/tests/auto/collections/collections.pro +++ b/tests/auto/collections/collections.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_collections.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/exceptionsafety/exceptionsafety.pro b/tests/auto/exceptionsafety/exceptionsafety.pro index d162219..52ba9e2 100644 --- a/tests/auto/exceptionsafety/exceptionsafety.pro +++ b/tests/auto/exceptionsafety/exceptionsafety.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_exceptionsafety.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/q_func_info/q_func_info.pro b/tests/auto/q_func_info/q_func_info.pro index b30e3fb..64f08d4 100644 --- a/tests/auto/q_func_info/q_func_info.pro +++ b/tests/auto/q_func_info/q_func_info.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_q_func_info.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qanimationgroup/qanimationgroup.pro b/tests/auto/qanimationgroup/qanimationgroup.pro index 31667a8..5e1be0c 100644 --- a/tests/auto/qanimationgroup/qanimationgroup.pro +++ b/tests/auto/qanimationgroup/qanimationgroup.pro @@ -3,3 +3,4 @@ QT = core SOURCES += tst_qanimationgroup.cpp +CONFIG += parallel_test diff --git a/tests/auto/qatomicint/qatomicint.pro b/tests/auto/qatomicint/qatomicint.pro index 4a09d5f..7850d93 100644 --- a/tests/auto/qatomicint/qatomicint.pro +++ b/tests/auto/qatomicint/qatomicint.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qatomicint.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qatomicpointer/qatomicpointer.pro b/tests/auto/qatomicpointer/qatomicpointer.pro index d192bad..89ff137 100644 --- a/tests/auto/qatomicpointer/qatomicpointer.pro +++ b/tests/auto/qatomicpointer/qatomicpointer.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qatomicpointer.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qbitarray/qbitarray.pro b/tests/auto/qbitarray/qbitarray.pro index ec110c6..358d81b 100644 --- a/tests/auto/qbitarray/qbitarray.pro +++ b/tests/auto/qbitarray/qbitarray.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qbitarray.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qbuffer/qbuffer.pro b/tests/auto/qbuffer/qbuffer.pro index ea83657..b768eb8 100644 --- a/tests/auto/qbuffer/qbuffer.pro +++ b/tests/auto/qbuffer/qbuffer.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qbuffer.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/qbytearray/qbytearray.pro index 35e48ad..f195dc8 100644 --- a/tests/auto/qbytearray/qbytearray.pro +++ b/tests/auto/qbytearray/qbytearray.pro @@ -18,3 +18,4 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD/\\\" } +CONFIG += parallel_test diff --git a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro index 1618c3e..a2458e6 100644 --- a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro +++ b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro @@ -2,3 +2,4 @@ load(qttest_p4) SOURCES += tst_qbytearraymatcher.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qcache/qcache.pro b/tests/auto/qcache/qcache.pro index 728b0b6..0da4e14 100644 --- a/tests/auto/qcache/qcache.pro +++ b/tests/auto/qcache/qcache.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qcache.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro index 9cfccc2..9fcf132 100644 --- a/tests/auto/qchar/qchar.pro +++ b/tests/auto/qchar/qchar.pro @@ -13,3 +13,4 @@ symbian: { } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } +CONFIG += parallel_test diff --git a/tests/auto/qcontiguouscache/qcontiguouscache.pro b/tests/auto/qcontiguouscache/qcontiguouscache.pro index 618efed..5951f87 100644 --- a/tests/auto/qcontiguouscache/qcontiguouscache.pro +++ b/tests/auto/qcontiguouscache/qcontiguouscache.pro @@ -6,3 +6,4 @@ SOURCES += tst_qcontiguouscache.cpp +CONFIG += parallel_test diff --git a/tests/auto/qcoreapplication/qcoreapplication.pro b/tests/auto/qcoreapplication/qcoreapplication.pro index 27f5e58..031af39 100644 --- a/tests/auto/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/qcoreapplication/qcoreapplication.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qcoreapplication.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/qcryptographichash/qcryptographichash.pro index 7e1a866..65e31dc 100644 --- a/tests/auto/qcryptographichash/qcryptographichash.pro +++ b/tests/auto/qcryptographichash/qcryptographichash.pro @@ -6,3 +6,4 @@ symbian: { TARGET.EPOCSTACKSIZE =0x5000 TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } +CONFIG += parallel_test diff --git a/tests/auto/qdate/qdate.pro b/tests/auto/qdate/qdate.pro index 6e2781b3..1c04100 100644 --- a/tests/auto/qdate/qdate.pro +++ b/tests/auto/qdate/qdate.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qdate.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qdatetime/qdatetime.pro b/tests/auto/qdatetime/qdatetime.pro index 02d3989..08a321e 100644 --- a/tests/auto/qdatetime/qdatetime.pro +++ b/tests/auto/qdatetime/qdatetime.pro @@ -12,3 +12,4 @@ win32-msvc|win32-msvc9x { } +CONFIG += parallel_test diff --git a/tests/auto/qdebug/qdebug.pro b/tests/auto/qdebug/qdebug.pro index 6e75a09..2b57168 100644 --- a/tests/auto/qdebug/qdebug.pro +++ b/tests/auto/qdebug/qdebug.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qdebug.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qdiriterator/qdiriterator.pro b/tests/auto/qdiriterator/qdiriterator.pro index 020b229..140b57d 100644 --- a/tests/auto/qdiriterator/qdiriterator.pro +++ b/tests/auto/qdiriterator/qdiriterator.pro @@ -10,3 +10,4 @@ wince*|symbian: { wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1 } +CONFIG += parallel_test diff --git a/tests/auto/qeasingcurve/qeasingcurve.pro b/tests/auto/qeasingcurve/qeasingcurve.pro index 2b66081..2a3a075 100644 --- a/tests/auto/qeasingcurve/qeasingcurve.pro +++ b/tests/auto/qeasingcurve/qeasingcurve.pro @@ -1,3 +1,4 @@ load(qttest_p4) QT = core SOURCES += tst_qeasingcurve.cpp +CONFIG += parallel_test diff --git a/tests/auto/qelapsedtimer/qelapsedtimer.pro b/tests/auto/qelapsedtimer/qelapsedtimer.pro index ed75228..8768876 100644 --- a/tests/auto/qelapsedtimer/qelapsedtimer.pro +++ b/tests/auto/qelapsedtimer/qelapsedtimer.pro @@ -11,3 +11,4 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD/\\\" } +CONFIG += parallel_test diff --git a/tests/auto/qevent/qevent.pro b/tests/auto/qevent/qevent.pro index 5c14299..6042b6c 100644 --- a/tests/auto/qevent/qevent.pro +++ b/tests/auto/qevent/qevent.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qevent.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro index 8a45aa2..cf574ff 100644 --- a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro +++ b/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qexplicitlyshareddatapointer.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qflags/qflags.pro b/tests/auto/qflags/qflags.pro index cd7f759..097a218 100644 --- a/tests/auto/qflags/qflags.pro +++ b/tests/auto/qflags/qflags.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qflags.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qfuture/qfuture.pro b/tests/auto/qfuture/qfuture.pro index c2b16b7..d6faae7 100644 --- a/tests/auto/qfuture/qfuture.pro +++ b/tests/auto/qfuture/qfuture.pro @@ -2,3 +2,4 @@ load(qttest_p4) DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qfuture.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qfuturewatcher/qfuturewatcher.pro b/tests/auto/qfuturewatcher/qfuturewatcher.pro index 79d8739..67f04ef 100644 --- a/tests/auto/qfuturewatcher/qfuturewatcher.pro +++ b/tests/auto/qfuturewatcher/qfuturewatcher.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qfuturewatcher.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qgetputenv/qgetputenv.pro b/tests/auto/qgetputenv/qgetputenv.pro index cbde272..df94f14 100644 --- a/tests/auto/qgetputenv/qgetputenv.pro +++ b/tests/auto/qgetputenv/qgetputenv.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qgetputenv.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qglobal/qglobal.pro b/tests/auto/qglobal/qglobal.pro index 8f1e00a..a4dffac 100644 --- a/tests/auto/qglobal/qglobal.pro +++ b/tests/auto/qglobal/qglobal.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qglobal.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qhash/qhash.pro b/tests/auto/qhash/qhash.pro index 86b98a2..16c9eab 100644 --- a/tests/auto/qhash/qhash.pro +++ b/tests/auto/qhash/qhash.pro @@ -6,3 +6,4 @@ symbian: { TARGET.EPOCSTACKSIZE =0x5000 TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } +CONFIG += parallel_test diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/qlibrary/qlibrary.pro index fd5790b..5dc129f 100644 --- a/tests/auto/qlibrary/qlibrary.pro +++ b/tests/auto/qlibrary/qlibrary.pro @@ -15,3 +15,4 @@ TARGET = tst_qlibrary # no special install rule for subdir INSTALLS = +CONFIG += parallel_test diff --git a/tests/auto/qline/qline.pro b/tests/auto/qline/qline.pro index 4651fd3..6e9af24 100644 --- a/tests/auto/qline/qline.pro +++ b/tests/auto/qline/qline.pro @@ -4,3 +4,4 @@ SOURCES += tst_qline.cpp unix:!mac:!symbian:!vxworks:LIBS+=-lm +CONFIG += parallel_test diff --git a/tests/auto/qmap/qmap.pro b/tests/auto/qmap/qmap.pro index 00b84d1..eaed926 100644 --- a/tests/auto/qmap/qmap.pro +++ b/tests/auto/qmap/qmap.pro @@ -4,3 +4,4 @@ QT = core SOURCES += tst_qmap.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qmargins/qmargins.pro b/tests/auto/qmargins/qmargins.pro index 5a6aa4f..0404da0 100644 --- a/tests/auto/qmargins/qmargins.pro +++ b/tests/auto/qmargins/qmargins.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qmargins.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qmath/qmath.pro b/tests/auto/qmath/qmath.pro index 03134ee..e5784ce 100644 --- a/tests/auto/qmath/qmath.pro +++ b/tests/auto/qmath/qmath.pro @@ -4,3 +4,4 @@ QT = core SOURCES += tst_qmath.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qmetatype/qmetatype.pro b/tests/auto/qmetatype/qmetatype.pro index a84d238..ed1de83 100644 --- a/tests/auto/qmetatype/qmetatype.pro +++ b/tests/auto/qmetatype/qmetatype.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qmetatype.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qmutex/qmutex.pro b/tests/auto/qmutex/qmutex.pro index bd24dcb..760dcfd 100644 --- a/tests/auto/qmutex/qmutex.pro +++ b/tests/auto/qmutex/qmutex.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qmutex.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qmutexlocker/qmutexlocker.pro b/tests/auto/qmutexlocker/qmutexlocker.pro index ff8a3da..01c3691 100644 --- a/tests/auto/qmutexlocker/qmutexlocker.pro +++ b/tests/auto/qmutexlocker/qmutexlocker.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qmutexlocker.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qnumeric/qnumeric.pro b/tests/auto/qnumeric/qnumeric.pro index 162f980..c0af962 100644 --- a/tests/auto/qnumeric/qnumeric.pro +++ b/tests/auto/qnumeric/qnumeric.pro @@ -4,3 +4,4 @@ QT = core SOURCES += tst_qnumeric.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qobject/qobject.pro b/tests/auto/qobject/qobject.pro index b6b3f20..113e14a 100644 --- a/tests/auto/qobject/qobject.pro +++ b/tests/auto/qobject/qobject.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs SUBDIRS = tst_qobject.pro signalbug.pro +CONFIG += parallel_test diff --git a/tests/auto/qobjectrace/qobjectrace.pro b/tests/auto/qobjectrace/qobjectrace.pro index 322adff..526875b 100644 --- a/tests/auto/qobjectrace/qobjectrace.pro +++ b/tests/auto/qobjectrace/qobjectrace.pro @@ -3,3 +3,4 @@ SOURCES += tst_qobjectrace.cpp QT = core TARGET.EPOCHEAPSIZE = 20000000 40000000 +CONFIG += parallel_test diff --git a/tests/auto/qplugin/qplugin.pro b/tests/auto/qplugin/qplugin.pro index aafcb36..37a12da 100644 --- a/tests/auto/qplugin/qplugin.pro +++ b/tests/auto/qplugin/qplugin.pro @@ -25,3 +25,4 @@ mac { SUBDIRS += tst_qplugin.pro +CONFIG += parallel_test diff --git a/tests/auto/qpluginloader/qpluginloader.pro b/tests/auto/qpluginloader/qpluginloader.pro index 382d6e4..6e41b4c 100644 --- a/tests/auto/qpluginloader/qpluginloader.pro +++ b/tests/auto/qpluginloader/qpluginloader.pro @@ -11,3 +11,4 @@ TARGET = tst_qpluginloader INSTALLS = +CONFIG += parallel_test diff --git a/tests/auto/qpoint/qpoint.pro b/tests/auto/qpoint/qpoint.pro index 8b006c2..fd24046 100644 --- a/tests/auto/qpoint/qpoint.pro +++ b/tests/auto/qpoint/qpoint.pro @@ -5,3 +5,4 @@ load(qttest_p4) SOURCES += tst_qpoint.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qprocessenvironment/qprocessenvironment.pro b/tests/auto/qprocessenvironment/qprocessenvironment.pro index 398facc..60dba50 100644 --- a/tests/auto/qprocessenvironment/qprocessenvironment.pro +++ b/tests/auto/qprocessenvironment/qprocessenvironment.pro @@ -3,3 +3,4 @@ load(qttest_p4) QT = core SOURCES += tst_qprocessenvironment.cpp +CONFIG += parallel_test diff --git a/tests/auto/qqueue/qqueue.pro b/tests/auto/qqueue/qqueue.pro index ed489f9..ce0d8c3 100644 --- a/tests/auto/qqueue/qqueue.pro +++ b/tests/auto/qqueue/qqueue.pro @@ -4,3 +4,4 @@ QT = core SOURCES += tst_qqueue.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qrand/qrand.pro b/tests/auto/qrand/qrand.pro index c868ed4..0db8af8 100644 --- a/tests/auto/qrand/qrand.pro +++ b/tests/auto/qrand/qrand.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qrand.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qreadlocker/qreadlocker.pro b/tests/auto/qreadlocker/qreadlocker.pro index 5919102..ee53307 100644 --- a/tests/auto/qreadlocker/qreadlocker.pro +++ b/tests/auto/qreadlocker/qreadlocker.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qreadlocker.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qreadwritelock/qreadwritelock.pro b/tests/auto/qreadwritelock/qreadwritelock.pro index 4318b18..93f7c68 100644 --- a/tests/auto/qreadwritelock/qreadwritelock.pro +++ b/tests/auto/qreadwritelock/qreadwritelock.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qreadwritelock.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qrect/qrect.pro b/tests/auto/qrect/qrect.pro index 75940b3..f1ad046e 100644 --- a/tests/auto/qrect/qrect.pro +++ b/tests/auto/qrect/qrect.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qrect.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qregexp/qregexp.pro b/tests/auto/qregexp/qregexp.pro index 80b6827..e0fef12 100644 --- a/tests/auto/qregexp/qregexp.pro +++ b/tests/auto/qregexp/qregexp.pro @@ -6,3 +6,4 @@ QT = core QT = core SOURCES += tst_qregexp.cpp +CONFIG += parallel_test diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro index 6bdeb1e..c0db52f 100644 --- a/tests/auto/qresourceengine/qresourceengine.pro +++ b/tests/auto/qresourceengine/qresourceengine.pro @@ -43,3 +43,4 @@ wince*|symbian:{ } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } +CONFIG += parallel_test diff --git a/tests/auto/qringbuffer/qringbuffer.pro b/tests/auto/qringbuffer/qringbuffer.pro index 91fb0a0..2e4f166 100644 --- a/tests/auto/qringbuffer/qringbuffer.pro +++ b/tests/auto/qringbuffer/qringbuffer.pro @@ -4,3 +4,4 @@ SOURCES += tst_qringbuffer.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qscopedpointer/qscopedpointer.pro b/tests/auto/qscopedpointer/qscopedpointer.pro index 13d8425..4a3d5b8d 100644 --- a/tests/auto/qscopedpointer/qscopedpointer.pro +++ b/tests/auto/qscopedpointer/qscopedpointer.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qscopedpointer.cpp QT -= gui +CONFIG += parallel_test diff --git a/tests/auto/qsemaphore/qsemaphore.pro b/tests/auto/qsemaphore/qsemaphore.pro index f720c0b..5978215 100644 --- a/tests/auto/qsemaphore/qsemaphore.pro +++ b/tests/auto/qsemaphore/qsemaphore.pro @@ -3,3 +3,4 @@ SOURCES += tst_qsemaphore.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro b/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro index 01ef68a..c0c10c0 100644 --- a/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro +++ b/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro @@ -3,3 +3,4 @@ QT = core SOURCES += tst_qsequentialanimationgroup.cpp +CONFIG += parallel_test diff --git a/tests/auto/qset/qset.pro b/tests/auto/qset/qset.pro index b45a015..ebdf0d6 100644 --- a/tests/auto/qset/qset.pro +++ b/tests/auto/qset/qset.pro @@ -6,3 +6,4 @@ symbian: { TARGET.EPOCSTACKSIZE =0x5000 TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } +CONFIG += parallel_test diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/qsharedpointer/qsharedpointer.pro index bbd31d7..014006e 100644 --- a/tests/auto/qsharedpointer/qsharedpointer.pro +++ b/tests/auto/qsharedpointer/qsharedpointer.pro @@ -12,3 +12,4 @@ QT = core !symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\" include(externaltests.pri) +CONFIG += parallel_test diff --git a/tests/auto/qsignalspy/qsignalspy.pro b/tests/auto/qsignalspy/qsignalspy.pro index 4bc4a7b..d3ae63b 100644 --- a/tests/auto/qsignalspy/qsignalspy.pro +++ b/tests/auto/qsignalspy/qsignalspy.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qsignalspy.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qsize/qsize.pro b/tests/auto/qsize/qsize.pro index 14786b8..a1814ac 100644 --- a/tests/auto/qsize/qsize.pro +++ b/tests/auto/qsize/qsize.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qsize.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qsizef/qsizef.pro b/tests/auto/qsizef/qsizef.pro index 703d721..5aa07d7 100644 --- a/tests/auto/qsizef/qsizef.pro +++ b/tests/auto/qsizef/qsizef.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qsizef.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qstate/qstate.pro b/tests/auto/qstate/qstate.pro index 9131fa8..6ee7e0c 100644 --- a/tests/auto/qstate/qstate.pro +++ b/tests/auto/qstate/qstate.pro @@ -3,3 +3,4 @@ QT = core SOURCES += tst_qstate.cpp +CONFIG += parallel_test diff --git a/tests/auto/qstl/qstl.pro b/tests/auto/qstl/qstl.pro index 5c99874..a0c9db1 100644 --- a/tests/auto/qstl/qstl.pro +++ b/tests/auto/qstl/qstl.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qstl.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qstring/qstring.pro b/tests/auto/qstring/qstring.pro index ed758c6..e980042 100644 --- a/tests/auto/qstring/qstring.pro +++ b/tests/auto/qstring/qstring.pro @@ -6,3 +6,4 @@ symbian:LIBS += -llibm QT = core DEFINES += QT_NO_CAST_TO_ASCII +CONFIG += parallel_test diff --git a/tests/auto/qstringbuilder1/qstringbuilder1.pro b/tests/auto/qstringbuilder1/qstringbuilder1.pro index 5bb14d4..dc9062f 100644 --- a/tests/auto/qstringbuilder1/qstringbuilder1.pro +++ b/tests/auto/qstringbuilder1/qstringbuilder1.pro @@ -4,3 +4,4 @@ QT = core SOURCES += tst_qstringbuilder1.cpp +CONFIG += parallel_test diff --git a/tests/auto/qstringbuilder2/qstringbuilder2.pro b/tests/auto/qstringbuilder2/qstringbuilder2.pro index 4152dc3..a57c6f1 100644 --- a/tests/auto/qstringbuilder2/qstringbuilder2.pro +++ b/tests/auto/qstringbuilder2/qstringbuilder2.pro @@ -3,3 +3,4 @@ load(qttest_p4) QT = core SOURCES += tst_qstringbuilder2.cpp +CONFIG += parallel_test diff --git a/tests/auto/qstringbuilder3/qstringbuilder3.pro b/tests/auto/qstringbuilder3/qstringbuilder3.pro index b4d2225..5aced7c 100644 --- a/tests/auto/qstringbuilder3/qstringbuilder3.pro +++ b/tests/auto/qstringbuilder3/qstringbuilder3.pro @@ -3,3 +3,4 @@ load(qttest_p4) QT = core SOURCES += tst_qstringbuilder3.cpp +CONFIG += parallel_test diff --git a/tests/auto/qstringbuilder4/qstringbuilder4.pro b/tests/auto/qstringbuilder4/qstringbuilder4.pro index 6ec5228..0532a9b 100644 --- a/tests/auto/qstringbuilder4/qstringbuilder4.pro +++ b/tests/auto/qstringbuilder4/qstringbuilder4.pro @@ -3,3 +3,4 @@ load(qttest_p4) QT = core SOURCES += tst_qstringbuilder4.cpp +CONFIG += parallel_test diff --git a/tests/auto/qstringlist/qstringlist.pro b/tests/auto/qstringlist/qstringlist.pro index aee074b..d82a348 100644 --- a/tests/auto/qstringlist/qstringlist.pro +++ b/tests/auto/qstringlist/qstringlist.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qstringlist.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qstringmatcher/qstringmatcher.pro b/tests/auto/qstringmatcher/qstringmatcher.pro index 2c15097..c5249ec 100644 --- a/tests/auto/qstringmatcher/qstringmatcher.pro +++ b/tests/auto/qstringmatcher/qstringmatcher.pro @@ -3,3 +3,4 @@ SOURCES += tst_qstringmatcher.cpp QT = core DEFINES += QT_NO_CAST_TO_ASCII +CONFIG += parallel_test diff --git a/tests/auto/qstringref/qstringref.pro b/tests/auto/qstringref/qstringref.pro index 48e7ddf..34f2de4 100644 --- a/tests/auto/qstringref/qstringref.pro +++ b/tests/auto/qstringref/qstringref.pro @@ -2,3 +2,4 @@ load(qttest_p4) SOURCES += tst_qstringref.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro index e93c5d2..ee2b77d 100644 --- a/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro +++ b/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro @@ -2,3 +2,5 @@ load(qttest_p4) DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qtconcurrentfilter.cpp QT = core +CONFIG += parallel_test +CONFIG += parallel_test diff --git a/tests/auto/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro b/tests/auto/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro index 4fdcc22..a61d275 100644 --- a/tests/auto/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro +++ b/tests/auto/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qtconcurrentiteratekernel.cpp QT = core +CONFIG += parallel_test +CONFIG += parallel_test diff --git a/tests/auto/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/qtconcurrentmap/qtconcurrentmap.pro index 8cae714..6fc3585 100644 --- a/tests/auto/qtconcurrentmap/qtconcurrentmap.pro +++ b/tests/auto/qtconcurrentmap/qtconcurrentmap.pro @@ -2,3 +2,5 @@ load(qttest_p4) DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qtconcurrentmap.cpp QT = core +CONFIG += parallel_test +CONFIG += parallel_test diff --git a/tests/auto/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/qtconcurrentrun/qtconcurrentrun.pro index ac29dd4..2457604 100644 --- a/tests/auto/qtconcurrentrun/qtconcurrentrun.pro +++ b/tests/auto/qtconcurrentrun/qtconcurrentrun.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qtconcurrentrun.cpp QT = core +CONFIG += parallel_test +CONFIG += parallel_test diff --git a/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro index cd8d74e..bbfcf5e 100644 --- a/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro +++ b/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qtconcurrentthreadengine.cpp QT = core +CONFIG += parallel_test +CONFIG += parallel_test diff --git a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro index e8fb9cb..5f3cb11 100644 --- a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro +++ b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro @@ -9,3 +9,4 @@ wince*|symbian:{ addFiles.path = . DEPLOYMENT += addFiles } +CONFIG += parallel_test diff --git a/tests/auto/qthread/qthread.pro b/tests/auto/qthread/qthread.pro index 0b042ab..d3b1028 100644 --- a/tests/auto/qthread/qthread.pro +++ b/tests/auto/qthread/qthread.pro @@ -2,3 +2,4 @@ load(qttest_p4) SOURCES += tst_qthread.cpp QT = core symbian:LIBS += -llibpthread +CONFIG += parallel_test diff --git a/tests/auto/qthreadonce/qthreadonce.pro b/tests/auto/qthreadonce/qthreadonce.pro index a672a03..d7ef4d4 100644 --- a/tests/auto/qthreadonce/qthreadonce.pro +++ b/tests/auto/qthreadonce/qthreadonce.pro @@ -10,3 +10,4 @@ QT = core # Temporary: SOURCES += qthreadonce.cpp +CONFIG += parallel_test diff --git a/tests/auto/qthreadpool/qthreadpool.pro b/tests/auto/qthreadpool/qthreadpool.pro index 3f6ea64..dbaeb20 100644 --- a/tests/auto/qthreadpool/qthreadpool.pro +++ b/tests/auto/qthreadpool/qthreadpool.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qthreadpool.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qthreadstorage/qthreadstorage.pro b/tests/auto/qthreadstorage/qthreadstorage.pro index a06f89c..0dc8d08 100644 --- a/tests/auto/qthreadstorage/qthreadstorage.pro +++ b/tests/auto/qthreadstorage/qthreadstorage.pro @@ -2,3 +2,4 @@ TEMPLATE = subdirs SUBDIRS = \ tst_qthreadstorage.pro \ crashOnExit.pro +CONFIG += parallel_test diff --git a/tests/auto/qtime/qtime.pro b/tests/auto/qtime/qtime.pro index 88277a0..ce4f7ae 100644 --- a/tests/auto/qtime/qtime.pro +++ b/tests/auto/qtime/qtime.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qtime.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qtimeline/qtimeline.pro b/tests/auto/qtimeline/qtimeline.pro index 7820455..9be717d 100644 --- a/tests/auto/qtimeline/qtimeline.pro +++ b/tests/auto/qtimeline/qtimeline.pro @@ -2,3 +2,4 @@ load(qttest_p4) QT = core SOURCES += tst_qtimeline.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qtimer/qtimer.pro b/tests/auto/qtimer/qtimer.pro index 79ae7db..086df1d 100644 --- a/tests/auto/qtimer/qtimer.pro +++ b/tests/auto/qtimer/qtimer.pro @@ -2,3 +2,4 @@ load(qttest_p4) QT = core SOURCES += tst_qtimer.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qtmd5/qtmd5.pro b/tests/auto/qtmd5/qtmd5.pro index cb4a539..0afc6b1 100644 --- a/tests/auto/qtmd5/qtmd5.pro +++ b/tests/auto/qtmd5/qtmd5.pro @@ -12,3 +12,4 @@ SOURCES += tst_qtmd5.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qtokenautomaton/qtokenautomaton.pro b/tests/auto/qtokenautomaton/qtokenautomaton.pro index 6ebf7c4..5e2e590 100644 --- a/tests/auto/qtokenautomaton/qtokenautomaton.pro +++ b/tests/auto/qtokenautomaton/qtokenautomaton.pro @@ -15,3 +15,4 @@ HEADERS += tokenizers/basic/basic.h \ tokenizers/withNamespace/withNamespace.h QT -= gui +CONFIG += parallel_test diff --git a/tests/auto/qurl/qurl.pro b/tests/auto/qurl/qurl.pro index 018bb38..a5c39a5 100644 --- a/tests/auto/qurl/qurl.pro +++ b/tests/auto/qurl/qurl.pro @@ -2,3 +2,4 @@ load(qttest_p4) SOURCES += tst_qurl.cpp QT = core symbian: TARGET.CAPABILITY = NetworkServices +CONFIG += parallel_test diff --git a/tests/auto/quuid/quuid.pro b/tests/auto/quuid/quuid.pro index 25e2456..461956f 100644 --- a/tests/auto/quuid/quuid.pro +++ b/tests/auto/quuid/quuid.pro @@ -4,3 +4,4 @@ SUBDIRS = testProcessUniqueness SUBDIRS += test +CONFIG += parallel_test diff --git a/tests/auto/qvarlengtharray/qvarlengtharray.pro b/tests/auto/qvarlengtharray/qvarlengtharray.pro index 7a02790..183da1b 100644 --- a/tests/auto/qvarlengtharray/qvarlengtharray.pro +++ b/tests/auto/qvarlengtharray/qvarlengtharray.pro @@ -2,3 +2,4 @@ load(qttest_p4) QT = core SOURCES += tst_qvarlengtharray.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qvector/qvector.pro b/tests/auto/qvector/qvector.pro index 80311b4..a7c3957 100644 --- a/tests/auto/qvector/qvector.pro +++ b/tests/auto/qvector/qvector.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qvector.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qwaitcondition/qwaitcondition.pro b/tests/auto/qwaitcondition/qwaitcondition.pro index 4d9a082..9af0c71 100644 --- a/tests/auto/qwaitcondition/qwaitcondition.pro +++ b/tests/auto/qwaitcondition/qwaitcondition.pro @@ -3,3 +3,4 @@ SOURCES += tst_qwaitcondition.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qwineventnotifier/qwineventnotifier.pro b/tests/auto/qwineventnotifier/qwineventnotifier.pro index 0c8bd2b..62da3a3 100644 --- a/tests/auto/qwineventnotifier/qwineventnotifier.pro +++ b/tests/auto/qwineventnotifier/qwineventnotifier.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qwineventnotifier.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/qwritelocker/qwritelocker.pro b/tests/auto/qwritelocker/qwritelocker.pro index acae4ef..39a98aa 100644 --- a/tests/auto/qwritelocker/qwritelocker.pro +++ b/tests/auto/qwritelocker/qwritelocker.pro @@ -1,3 +1,4 @@ load(qttest_p4) SOURCES += tst_qwritelocker.cpp QT = core +CONFIG += parallel_test diff --git a/tests/auto/selftests/selftests.pro b/tests/auto/selftests/selftests.pro index d854b5e..2f1c327 100644 --- a/tests/auto/selftests/selftests.pro +++ b/tests/auto/selftests/selftests.pro @@ -12,3 +12,4 @@ INSTALLS = QT = core +CONFIG += parallel_test diff --git a/tests/auto/utf8/utf8.pro b/tests/auto/utf8/utf8.pro index 4ec6851..aa133fe 100644 --- a/tests/auto/utf8/utf8.pro +++ b/tests/auto/utf8/utf8.pro @@ -1,3 +1,4 @@ load(qttest_p4) QT -= gui SOURCES += tst_utf8.cpp +CONFIG += parallel_test -- cgit v0.12 From 4b65920161b7e7f14b05b9f25c008ff1c1252d4e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 8 Nov 2010 09:56:56 +0100 Subject: Fix warnings Regarding conversion from char* to QString Reviewed-by: Joao --- src/gui/text/qtextdocument.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 3aa6795..496accd 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -2612,8 +2612,8 @@ void QTextHtmlExporter::emitBlock(const QTextBlock &block) if (format.hasProperty(QTextFormat::ListNumberPrefix)) { QString numberPrefix = format.numberPrefix(); - numberPrefix.replace('"', "\\22"); - numberPrefix.replace('\'', "\\27"); // FIXME: There's a problem in the CSS parser the prevents this from being correctly restored + numberPrefix.replace(QLatin1Char('"'), QLatin1String("\\22")); + numberPrefix.replace(QLatin1Char('\''), QLatin1String("\\27")); // FIXME: There's a problem in the CSS parser the prevents this from being correctly restored styleString += QLatin1String(" -qt-list-number-prefix: "); styleString += QLatin1Char('\''); styleString += numberPrefix; @@ -2624,8 +2624,8 @@ void QTextHtmlExporter::emitBlock(const QTextBlock &block) if (format.hasProperty(QTextFormat::ListNumberSuffix)) { if (format.numberSuffix() != QLatin1String(".")) { // this is our default QString numberSuffix = format.numberSuffix(); - numberSuffix.replace('"', "\\22"); - numberSuffix.replace('\'', "\\27"); // see above + numberSuffix.replace(QLatin1Char('"'), QLatin1String("\\22")); + numberSuffix.replace(QLatin1Char('\''), QLatin1String("\\27")); // see above styleString += QLatin1String(" -qt-list-number-suffix: "); styleString += QLatin1Char('\''); styleString += numberSuffix; -- cgit v0.12 From d40088433a96746c1904b9a2fc2999b784fe8850 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 10 Nov 2010 17:40:17 +0100 Subject: Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023 It is a typo. Else, it overflows --- src/corelib/tools/qbytearray.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 68789d9..f26d878 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -541,7 +541,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) forever { ulong alloc = len; - if (len >= (2 << 31) - sizeof(QByteArray::Data)) { + if (len >= (1 << 31) - sizeof(QByteArray::Data)) { //QByteArray does not support that huge size anyway. qWarning("qUncompress: Input data is corrupted"); return QByteArray(); @@ -561,7 +561,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) switch (res) { case Z_OK: if (len != alloc) { - if (len >= (2 << 31) - sizeof(QByteArray::Data)) { + if (len >= (1 << 31) - sizeof(QByteArray::Data)) { //QByteArray does not support that huge size anyway. qWarning("qUncompress: Input data is corrupted"); return QByteArray(); -- cgit v0.12