diff --git a/configure b/configure index d599cb5535..fd0c185c17 100755 --- a/configure +++ b/configure @@ -751,6 +751,7 @@ CFG_DECORATION_PLUGIN_AVAILABLE= CFG_DECORATION_PLUGIN= CFG_XINPUT=runtime CFG_XKB=auto +CFG_XCB=no CFG_NIS=auto CFG_CUPS=auto CFG_ICONV=auto @@ -1043,7 +1044,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -1971,6 +1972,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + xcb) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_XCB="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; cups) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_CUPS="$VAL" @@ -3711,6 +3719,14 @@ if [ "$OPT_HELP" = "yes" ]; then PHN=" " fi + if [ "$CFG_XCB" = "no" ]; then + XCY=" " + XCN="*" + else + XCY="*" + XCN=" " + fi + cat <] [-prefix-install] [-bindir ] [-libdir ] [-docdir ] [-headerdir ] [-plugindir ] [-importdir ] [-datadir ] @@ -4061,6 +4077,9 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye $SBN -no-separate-debug-info . Do not store debug information in a separate file. $SBY -separate-debug-info .... Strip debug information into a separate .debug file. + $XKN -no-xcb ............ Do not compile Xcb (X protocol C-language Binding) support. + $XKY -xcb ............... Compile Xcb support. + EOF fi # X11/QWS @@ -7270,6 +7289,7 @@ fi [ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl" [ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked" [ "$CFG_MAC_HARFBUZZ" = "yes" ] && QT_CONFIG="$QT_CONFIG harfbuzz" +[ "$CFG_XCB" = "yes" ] && QT_CONFIG="$QT_CONFIG xcb" if [ "$PLATFORM_X11" = "yes" ]; then [ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm" @@ -7524,10 +7544,8 @@ EOF canBuildQtConcurrent="no" ;; symbian-gcce) - canBuildQtConcurrent="no" ;; symbian-armcc) - canBuildQtConcurrent="no" ;; esac @@ -8256,7 +8274,7 @@ if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then # We cannot use Linux's default export rules since they export everything. QCONFIG_FLAGS="$QCONFIG_FLAGS QT_DLL" # Disable non-working features. - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT QT_NO_QFUTURE QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON" + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON" fi if [ -n "$QCONFIG_FLAGS" ]; then @@ -8834,6 +8852,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then fi echo "ICD support ............ $CFG_ICD" echo "libICU support ......... $CFG_ICU" +echo "Xcb support ............ $CFG_XCB" echo [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........... $CFG_PTMALLOC" diff --git a/configure.exe b/configure.exe index 9ccd3af81d..6860244b30 100644 Binary files a/configure.exe and b/configure.exe differ diff --git a/doc/src/snippets/qstring/stringbuilder.cpp b/doc/src/snippets/qstring/stringbuilder.cpp index 8ff1dd8206..b8acbc1e2a 100644 --- a/doc/src/snippets/qstring/stringbuilder.cpp +++ b/doc/src/snippets/qstring/stringbuilder.cpp @@ -49,14 +49,9 @@ //! [0] //! [3] - #define QT_USE_FAST_CONCATENATION + DEFINES *= QT_USE_QSTRINGBUILDER //! [3] -//! [4] - #define QT_USE_FAST_CONCATENATION - #define QT_USE_FAST_OPERATOR_PLUS -//! [4] - //! [5] #include diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 7a7c9e305a..eb0aa9fb85 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -38,6 +38,10 @@ embedded: check.commands += -qws # Allow for custom arguments to tests check.commands += $(TESTARGS) + +# If the test is marked as insignificant, discard the exit code +insignificant_test:check.commands = -$${check.commands} + QMAKE_EXTRA_TARGETS *= check !debug_and_release|build_pass { diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 0627b4e568..df58d95131 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -57,9 +57,10 @@ # ifdef QT_USE_FAST_OPERATOR_PLUS # undef QT_USE_FAST_OPERATOR_PLUS # endif -# ifdef QT_USE_FAST_CONCATENATION -# undef QT_USE_FAST_CONCATENATION +# ifdef QT_USE_QSTRINGBUILDER +# undef QT_USE_QSTRINGBUILDER # endif + #endif @@ -559,8 +560,7 @@ inline bool operator>=(const QByteArray &a1, const char *a2) { return qstrcmp(a1, a2) >= 0; } inline bool operator>=(const char *a1, const QByteArray &a2) { return qstrcmp(a1, a2) >= 0; } -#ifndef QT_USE_FAST_OPERATOR_PLUS -# ifndef QT_USE_FAST_CONCATENATION +#if !defined(QT_USE_QSTRINGBUILDER) inline const QByteArray operator+(const QByteArray &a1, const QByteArray &a2) { return QByteArray(a1) += a2; } inline const QByteArray operator+(const QByteArray &a1, const char *a2) @@ -571,8 +571,7 @@ inline const QByteArray operator+(const char *a1, const QByteArray &a2) { return QByteArray(a1) += a2; } inline const QByteArray operator+(char a1, const QByteArray &a2) { return QByteArray(&a1, 1) += a2; } -# endif // QT_USE_FAST_CONCATENATION -#endif // QT_USE_FAST_OPERATOR_PLUS +#endif // QT_USE_QSTRINGBUILDER inline QBool QByteArray::contains(const char *c) const { return QBool(indexOf(c) != -1); } inline QByteArray &QByteArray::replace(char before, const char *c) @@ -615,7 +614,7 @@ QT_END_NAMESPACE QT_END_HEADER -#ifdef QT_USE_FAST_CONCATENATION +#ifdef QT_USE_QSTRINGBUILDER #include #endif diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 5493ba915b..3b3f715b9d 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -777,16 +777,12 @@ const QString::Null QString::null = { }; \snippet doc/src/snippets/qstring/stringbuilder.cpp 5 - A more global approach is to include this define: + A more global approach which is the most convenient but + not entirely source compatible, is to this define in your + .pro file: \snippet doc/src/snippets/qstring/stringbuilder.cpp 3 - and use \c{'%'} instead of \c{'+'} for string concatenation - everywhere. The third approach, which is the most convenient but - not entirely source compatible, is to include two defines: - - \snippet doc/src/snippets/qstring/stringbuilder.cpp 4 - and the \c{'+'} will automatically be performed as the \c{QStringBuilder} \c{'%'} everywhere. diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 6418a8cbd4..7c4367efde 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1016,8 +1016,7 @@ inline int QByteArray::findRev(const QString &s, int from) const # endif // QT3_SUPPORT #endif // QT_NO_CAST_TO_ASCII -#ifndef QT_USE_FAST_OPERATOR_PLUS -# ifndef QT_USE_FAST_CONCATENATION +#if !defined(QT_USE_FAST_OPERATOR_PLUS) && !defined(QT_USE_QSTRINGBUILDER) inline const QString operator+(const QString &s1, const QString &s2) { QString t(s1); t += s2; return t; } inline const QString operator+(const QString &s1, QChar s2) @@ -1038,8 +1037,7 @@ inline QT_ASCII_CAST_WARN const QString operator+(const QByteArray &ba, const QS inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, const QByteArray &ba) { QString t(s); t += QString::fromAscii(ba.constData(), qstrnlen(ba.constData(), ba.size())); return t; } # endif // QT_NO_CAST_FROM_ASCII -# endif // QT_USE_FAST_CONCATENATION -#endif // QT_USE_FAST_OPERATOR_PLUS +#endif // QT_USE_QSTRINGBUILDER #ifndef QT_NO_STL inline std::string QString::toStdString() const @@ -1288,7 +1286,7 @@ QT_END_NAMESPACE QT_END_HEADER -#ifdef QT_USE_FAST_CONCATENATION +#if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER) #include #endif diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 2d3475fed9..029aa0b216 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -410,7 +410,9 @@ operator%(const A &a, const B &b) return QStringBuilder::type, typename QConcatenable::type>(a, b); } -#ifdef QT_USE_FAST_OPERATOR_PLUS +// QT_USE_FAST_OPERATOR_PLUS was introduced in 4.7, QT_USE_QSTRINGBUILDER is to be used from 4.8 onwards +// QT_USE_FAST_OPERATOR_PLUS does not remove the normal operator+ for QByteArray +#if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER) template QStringBuilder::type, typename QConcatenable::type> operator+(const A &a, const B &b) diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 1a6b090f63..1f342aeef7 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -532,8 +532,7 @@ QString QColor::name() const void QColor::setNamedColor(const QString &name) { - if (!setColorFromString(name)) - qWarning("QColor::setNamedColor: Unknown color name '%s'", name.toLatin1().constData()); + setColorFromString(name); } /*! diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp index e673dd9861..a098e82e19 100644 --- a/src/gui/painting/qdrawhelper_neon.cpp +++ b/src/gui/painting/qdrawhelper_neon.cpp @@ -986,7 +986,7 @@ public: static inline Int32x4 v_toInt(Float32x4 x) { return vcvtq_s32_f32(x); } - static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return vcge_f32(a, b); } + static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return vreinterpretq_s32_u32(vcgeq_f32(a, b)); } }; const uint * QT_FASTCALL qt_fetch_radial_gradient_neon(uint *buffer, const Operator *op, const QSpanData *data, diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 8b7883bc58..2cc8863091 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3008,8 +3008,16 @@ void QRasterPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) ensurePen(); ensureState(); - drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->glyphPositions, - textItem->fontEngine()); + QRasterPaintEngineState *s = state(); + + QFontEngine *fontEngine = textItem->fontEngine(); + const qreal pixelSize = fontEngine->fontDef.pixelSize; + if (pixelSize * pixelSize * qAbs(s->matrix.determinant()) < 64 * 64) { + drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->glyphPositions, + fontEngine); + } else { + QPaintEngineEx::drawStaticTextItem(textItem); + } } /*! diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index bbdf76f0c0..304e5fc486 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -44,6 +44,8 @@ #include "qstroker_p.h" #include "qbezier_p.h" #include +#include +#include #include #include @@ -1057,5 +1059,38 @@ Q_GUI_EXPORT QPainterPath qt_painterPathFromVectorPath(const QVectorPath &path) return p; } +void QPaintEngineEx::drawStaticTextItem(QStaticTextItem *staticTextItem) +{ + QPainterPath path; +#ifndef Q_WS_MAC + path.setFillRule(Qt::WindingFill); +#endif + + if (staticTextItem->numGlyphs == 0) + return; + + QFontEngine *fontEngine = staticTextItem->fontEngine(); + fontEngine->addGlyphsToPath(staticTextItem->glyphs, staticTextItem->glyphPositions, + staticTextItem->numGlyphs, &path, 0); + if (!path.isEmpty()) { + QPainterState *s = state(); + QPainter::RenderHints oldHints = s->renderHints; + bool changedHints = false; + if (bool(oldHints & QPainter::TextAntialiasing) + && !bool(fontEngine->fontDef.styleStrategy & QFont::NoAntialias) + && !bool(oldHints & QPainter::Antialiasing)) { + s->renderHints |= QPainter::Antialiasing; + renderHintsChanged(); + changedHints = true; + } + + fill(qtVectorPathForPath(path), staticTextItem->color); + + if (changedHints) { + s->renderHints = oldHints; + renderHintsChanged(); + } + } +} QT_END_NAMESPACE diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index da469936fc..39f872a27c 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -201,7 +201,7 @@ public: virtual void updateState(const QPaintEngineState &state); - virtual void drawStaticTextItem(QStaticTextItem *) = 0; + virtual void drawStaticTextItem(QStaticTextItem *); virtual void setState(QPainterState *s); inline QPainterState *state() { return static_cast(QPaintEngine::state); } diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 4dae2a3784..855eaec8c4 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -795,7 +795,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags, if (set && set->outline_drawing) load_flags = FT_LOAD_NO_BITMAP; - if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics)) + if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || set->outline_drawing) load_flags |= FT_LOAD_NO_HINTING; else load_flags |= load_target; diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index ae7d7a1486..4e7c286d80 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -720,7 +720,8 @@ Q_IPV6ADDR QHostAddress::toIPv6Address() const Returns the address as a string. For example, if the address is the IPv4 address 127.0.0.1, the - returned string is "127.0.0.1". + returned string is "127.0.0.1". For IPv6 the string format will + follow the RFC5952 recommendation. \sa toIPv4Address() */ @@ -741,8 +742,32 @@ QString QHostAddress::toString() const ugle[i] = (quint16(d->a6[2*i]) << 8) | quint16(d->a6[2*i+1]); } QString s; - s.sprintf("%X:%X:%X:%X:%X:%X:%X:%X", - ugle[0], ugle[1], ugle[2], ugle[3], ugle[4], ugle[5], ugle[6], ugle[7]); + QString temp; + bool zeroDetected = false; + bool zeroShortened = false; + for (int i = 0; i < 8; i++) { + if ((ugle[i] != 0) || zeroShortened) { + temp.sprintf("%X", ugle[i]); + s.append(temp); + if (zeroDetected) + zeroShortened = true; + } else { + if (!zeroDetected) { + if (i<7 && (ugle[i+1] == 0)) { + s.append(QLatin1Char(':')); + zeroDetected = true; + } else { + temp.sprintf("%X", ugle[i]); + s.append(temp); + if (i<7) + s.append(QLatin1Char(':')); + } + } + } + if (i<7 && ((ugle[i] != 0) || zeroShortened || (i==0 && zeroDetected))) + s.append(QLatin1Char(':')); + } + if (!d->scopeId.isEmpty()) s.append(QLatin1Char('%') + d->scopeId); return s; diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 6098bdeee0..7f251a782b 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -219,7 +219,7 @@ static QNetworkInterfacePrivate *findInterface(int socket, QList= 0) { - uchar *addr = (uchar *)&req.ifr_addr; + uchar *addr = (uchar *)req.ifr_addr.sa_data; iface->hardwareAddress = iface->makeHwAddress(6, addr); } #endif diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index f702f13359..fa8b0d0612 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1436,19 +1436,30 @@ void QGL2PaintEngineEx::drawStaticTextItem(QStaticTextItem *textItem) ensureActive(); - QFontEngineGlyphCache::Type glyphType = textItem->fontEngine()->glyphFormat >= 0 - ? QFontEngineGlyphCache::Type(textItem->fontEngine()->glyphFormat) - : d->glyphCacheType; - if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) { - if (d->device->alphaRequested() || state()->matrix.type() > QTransform::TxTranslate - || (state()->composition_mode != QPainter::CompositionMode_Source - && state()->composition_mode != QPainter::CompositionMode_SourceOver)) - { - glyphType = QFontEngineGlyphCache::Raster_A8; - } - } + QPainterState *s = state(); + float det = s->matrix.determinant(); - d->drawCachedGlyphs(glyphType, textItem); + // don't try to cache huge fonts or vastly transformed fonts + QFontEngine *fontEngine = textItem->fontEngine(); + const qreal pixelSize = fontEngine->fontDef.pixelSize; + if (pixelSize * pixelSize * qAbs(det) < QT_MAX_CACHED_GLYPH_SIZE * QT_MAX_CACHED_GLYPH_SIZE || + det < 0.25f || det > 4.f) { + QFontEngineGlyphCache::Type glyphType = fontEngine->glyphFormat >= 0 + ? QFontEngineGlyphCache::Type(textItem->fontEngine()->glyphFormat) + : d->glyphCacheType; + if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) { + if (d->device->alphaRequested() || s->matrix.type() > QTransform::TxTranslate + || (s->composition_mode != QPainter::CompositionMode_Source + && s->composition_mode != QPainter::CompositionMode_SourceOver)) + { + glyphType = QFontEngineGlyphCache::Raster_A8; + } + } + + d->drawCachedGlyphs(glyphType, textItem); + } else { + QPaintEngineEx::drawStaticTextItem(textItem); + } } bool QGL2PaintEngineEx::drawTexture(const QRectF &dest, GLuint textureId, const QSize &size, const QRectF &src) diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 5eaaee9702..9c3d4246ae 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -83,21 +83,21 @@ QGLFormat QGLFormat::fromWindowFormat(const QWindowFormat &format) QWindowFormat QGLFormat::toWindowFormat(const QGLFormat &format) { QWindowFormat retFormat; - if (format.alphaBufferSize() >= 0) - retFormat.setAlphaBufferSize(format.alphaBufferSize()); + if (format.alpha()) + retFormat.setAlphaBufferSize(format.alphaBufferSize() == -1 ? 1 : format.alphaBufferSize()); if (format.blueBufferSize() >= 0) retFormat.setBlueBufferSize(format.blueBufferSize()); if (format.greenBufferSize() >= 0) retFormat.setGreenBufferSize(format.greenBufferSize()); if (format.redBufferSize() >= 0) retFormat.setRedBufferSize(format.redBufferSize()); - if (format.depthBufferSize() >= 0) - retFormat.setDepthBufferSize(format.depthBufferSize()); + if (format.depth()) + retFormat.setDepthBufferSize(format.depthBufferSize() == -1 ? 1 : format.depthBufferSize()); retFormat.setSwapBehavior(format.doubleBuffer() ? QWindowFormat::DoubleBuffer : QWindowFormat::DefaultSwapBehavior); - if (format.sampleBuffers() && format.samples() > 1) - retFormat.setSamples(format.samples()); - if (format.stencil() && format.stencilBufferSize() > 0) - retFormat.setStencilBufferSize(format.stencilBufferSize()); + if (format.sampleBuffers()) + retFormat.setSamples(format.samples() == -1 ? 4 : format.samples()); + if (format.stencil()) + retFormat.setStencilBufferSize(format.stencilBufferSize() == -1 ? 1 : format.stencilBufferSize()); retFormat.setStereo(format.stereo()); return retFormat; } @@ -138,6 +138,8 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) winFormat.setSharedContext(shareContext->d_func()->windowContext); } widget->windowHandle()->setSurfaceType(QWindow::OpenGLSurface); + if (widget->testAttribute(Qt::WA_TranslucentBackground)) + winFormat.setAlphaBufferSize(qMax(winFormat.alphaBufferSize(), 8)); winFormat.setWindowSurface(false); widget->windowHandle()->setWindowFormat(winFormat); widget->winId();//make window diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 4598bffabb..8ca95a88c9 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -362,17 +362,17 @@ QGLShader::ShaderType QGLShader::shaderType() const // The precision qualifiers are useful on OpenGL/ES systems, // but usually not present on desktop systems. Define the // keywords to empty strings on desktop systems. -#ifndef QT_OPENGL_ES +#if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_FORCE_SHADER_DEFINES) #define QGL_DEFINE_QUALIFIERS 1 static const char qualifierDefines[] = "#define lowp\n" "#define mediump\n" "#define highp\n"; -#endif + +#else // The "highp" qualifier doesn't exist in fragment shaders // on all ES platforms. When it doesn't exist, use "mediump". -#ifdef QT_OPENGL_ES #define QGL_REDEFINE_HIGHP 1 static const char redefineHighp[] = "#ifndef GL_FRAGMENT_PRECISION_HIGH\n" diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 62a631855f..4f194327ad 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -485,19 +485,30 @@ void QGLWindowSurface::beginPaint(const QRegion &) d_ptr->did_paint = true; updateGeometry(); - if (!context()) - return; - int clearFlags = 0; - if (context()->d_func()->workaround_needsFullClearOnEveryFrame) +#if 0 + QGLContext *ctx = reinterpret_cast(window()->d_func()->extraData()->glContext); +#endif + const QGLContext *ctx = QGLContext::currentContext(); + + if (!ctx) + return; + + if (ctx->d_func()->workaround_needsFullClearOnEveryFrame) clearFlags = GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT; - else if (context()->format().alpha()) + else if (ctx->format().alpha()) clearFlags = GL_COLOR_BUFFER_BIT; if (clearFlags) { + if (d_ptr->fbo) + d_ptr->fbo->bind(); + glClearColor(0.0, 0.0, 0.0, 0.0); glClear(clearFlags); + + if (d_ptr->fbo) + d_ptr->fbo->release(); } } diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp index 49190d310f..3ea5300d51 100644 --- a/src/plugins/codecs/jp/qsjiscodec.cpp +++ b/src/plugins/codecs/jp/qsjiscodec.cpp @@ -155,7 +155,9 @@ QString QSjisCodec::convertToUnicode(const char* chars, int len, ConverterState uchar ch = chars[i]; switch (nbuf) { case 0: - if (ch < 0x80 || IsKana(ch)) { + if (ch < 0x80) { + result += QValidChar(ch); + } else if (IsKana(ch)) { // JIS X 0201 Latin or JIS X 0201 Kana u = conv->jisx0201ToUnicode(ch); result += QValidChar(u); diff --git a/src/plugins/platforms/glxconvenience/glxconvenience.pri b/src/plugins/platforms/glxconvenience/glxconvenience.pri index d6c992229e..b4d43a30b5 100644 --- a/src/plugins/platforms/glxconvenience/glxconvenience.pri +++ b/src/plugins/platforms/glxconvenience/glxconvenience.pri @@ -5,3 +5,11 @@ HEADERS += \ SOURCES += \ $$PWD/qglxconvenience.cpp + +CONFIG += xrender + +xrender { + LIBS += -lXrender +} else { + DEFINES += QT_NO_XRENDER +} diff --git a/src/plugins/platforms/glxconvenience/qglxconvenience.cpp b/src/plugins/platforms/glxconvenience/qglxconvenience.cpp index abf7b83e04..1d9c5090dd 100644 --- a/src/plugins/platforms/glxconvenience/qglxconvenience.cpp +++ b/src/plugins/platforms/glxconvenience/qglxconvenience.cpp @@ -43,6 +43,10 @@ #include +#ifndef QT_NO_XRENDER +#include +#endif + enum { XFocusOut = FocusOut, XFocusIn = FocusIn, @@ -76,19 +80,25 @@ QVector qglx_buildSpec(const QWindowFormat &format, int drawableBit) spec[i++] = GLX_DRAWABLE_TYPE; spec[i++] = drawableBit; spec[i++] = GLX_RENDER_TYPE; spec[i++] = GLX_RGBA_BIT; + spec[i++] = GLX_RED_SIZE; spec[i++] = (format.redBufferSize() == -1) ? 1 : format.redBufferSize(); spec[i++] = GLX_GREEN_SIZE; spec[i++] = (format.greenBufferSize() == -1) ? 1 : format.greenBufferSize(); spec[i++] = GLX_BLUE_SIZE; spec[i++] = (format.blueBufferSize() == -1) ? 1 : format.blueBufferSize(); if (format.hasAlpha()) { - spec[i++] = GLX_ALPHA_SIZE; spec[i++] = (format.alphaBufferSize() == -1) ? 1 : format.alphaBufferSize(); + spec[i++] = GLX_ALPHA_SIZE; spec[i++] = format.alphaBufferSize(); } spec[i++] = GLX_DOUBLEBUFFER; spec[i++] = format.swapBehavior() != QWindowFormat::SingleBuffer ? True : False; + spec[i++] = GLX_STEREO; spec[i++] = format.stereo() ? True : False; - spec[i++] = GLX_DEPTH_SIZE; spec[i++] = (format.depthBufferSize() == -1) ? 1 : format.depthBufferSize(); + if (format.depthBufferSize() > 0) { + spec[i++] = GLX_DEPTH_SIZE; spec[i++] = format.depthBufferSize(); + } - spec[i++] = GLX_STENCIL_SIZE; spec[i++] = (format.stencilBufferSize() == -1) ? 1 : format.stencilBufferSize(); + if (format.stencilBufferSize() > 0) { + spec[i++] = GLX_STENCIL_SIZE; spec[i++] = (format.stencilBufferSize() == -1) ? 1 : format.stencilBufferSize(); + } if (format.samples() > 1) { spec[i++] = GLX_SAMPLE_BUFFERS_ARB; @@ -119,8 +129,17 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , const QWindowFormat & if (reducedFormat.hasAlpha()) { int alphaSize; glXGetFBConfigAttrib(display,configs[i],GLX_ALPHA_SIZE,&alphaSize); - if (alphaSize > 0) - break; + if (alphaSize > 0) { + XVisualInfo *visual = glXGetVisualFromFBConfig(display, chosenConfig); +#if !defined(QT_NO_XRENDER) + XRenderPictFormat *pictFormat = XRenderFindVisualFormat(display, visual->visual); + if (pictFormat->direct.alphaMask > 0) + break; +#else + if (visual->depth == 32) + break; +#endif + } } else { break; // Just choose the first in the list if there's no alpha requested } diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 1fb4f01c1e..13dba86691 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -50,8 +50,8 @@ QMinimalIntegration::QMinimalIntegration() QMinimalScreen *mPrimaryScreen = new QMinimalScreen(); mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320); - mPrimaryScreen->mDepth = 16; - mPrimaryScreen->mFormat = QImage::Format_RGB16; + mPrimaryScreen->mDepth = 32; + mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied; mScreens.append(mPrimaryScreen); } diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index 7191441b91..eecb4e51a7 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -51,7 +51,7 @@ class QMinimalScreen : public QPlatformScreen { public: QMinimalScreen() - : mDepth(16), mFormat(QImage::Format_RGB16) {} + : mDepth(32), mFormat(QImage::Format_ARGB32_Premultiplied) {} QRect geometry() const { return mGeometry; } int depth() const { return mDepth; } diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index f27ec830e3..9d7ae296a9 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -6,7 +6,10 @@ contains(QT_CONFIG, wayland) { SUBDIRS += wayland } +contains(QT_CONFIG, xcb) { + SUBDIRS += xcb +} + mac { SUBDIRS += cocoa } - diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp index 39316adf6c..39bd99e5a0 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp @@ -132,10 +132,12 @@ void QWaylandXCompositeGLXContext::geometryChanged() Colormap cmap = XCreateColormap(mGlxIntegration->xDisplay(),mGlxIntegration->rootWindow(),visualInfo->visual,AllocNone); XSetWindowAttributes a; + a.background_pixel = WhitePixel(mGlxIntegration->xDisplay(), mGlxIntegration->screen()); + a.border_pixel = BlackPixel(mGlxIntegration->xDisplay(), mGlxIntegration->screen()); a.colormap = cmap; mXWindow = XCreateWindow(mGlxIntegration->xDisplay(), mGlxIntegration->rootWindow(),0, 0, size.width(), size.height(), 0, visualInfo->depth, InputOutput, visualInfo->visual, - CWColormap, &a); + CWBackPixel|CWBorderPixel|CWColormap, &a); XCompositeRedirectWindow(mGlxIntegration->xDisplay(), mXWindow, CompositeRedirectManual); XMapWindow(mGlxIntegration->xDisplay(), mXWindow); diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp index 77c9990d9e..3c90112a91 100644 --- a/src/plugins/platforms/wayland/qwaylandclipboard.cpp +++ b/src/plugins/platforms/wayland/qwaylandclipboard.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include static QWaylandClipboard *clipboard; diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index bd3f210533..310e266e64 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -51,6 +51,10 @@ #include "gl_integration/qwaylandglintegration.h" #endif +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT +#include "windowmanager_integration/qwaylandwindowmanagerintegration.h" +#endif + #include #include @@ -96,6 +100,13 @@ QWaylandGLIntegration * QWaylandDisplay::eglIntegration() } #endif +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT +QWaylandWindowManagerIntegration *QWaylandDisplay::windowManagerIntegration() +{ + return mWindowManagerIntegration; +} +#endif + void QWaylandDisplay::shellHandleConfigure(void *data, struct wl_shell *shell, uint32_t time, uint32_t edges, struct wl_surface *surface, @@ -135,6 +146,10 @@ QWaylandDisplay::QWaylandDisplay(void) mEglIntegration->initialize(); #endif +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT + mWindowManagerIntegration = QWaylandWindowManagerIntegration::createIntegration(this); +#endif + connect(QAbstractEventDispatcher::instance(), SIGNAL(aboutToBlock()), this, SLOT(flushRequests())); mFd = wl_display_get_fd(mDisplay, sourceUpdate, this); diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h index 0658956dc3..626636038d 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.h +++ b/src/plugins/platforms/wayland/qwaylanddisplay.h @@ -55,6 +55,8 @@ class QWaylandBuffer; class QPlatformScreen; class QWaylandScreen; class QWaylandGLIntegration; +class QWaylandWindowManagerIntegration; + class QWaylandDisplay : public QObject { Q_OBJECT @@ -74,6 +76,11 @@ public: #ifdef QT_WAYLAND_GL_SUPPORT QWaylandGLIntegration *eglIntegration(); #endif + +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT + QWaylandWindowManagerIntegration *windowManagerIntegration(); +#endif + void setCursor(QWaylandBuffer *buffer, int32_t x, int32_t y); void syncCallback(wl_display_sync_func_t func, void *data); @@ -124,6 +131,10 @@ private: QWaylandGLIntegration *mEglIntegration; #endif +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT + QWaylandWindowManagerIntegration *mWindowManagerIntegration; +#endif + static void shellHandleConfigure(void *data, struct wl_shell *shell, uint32_t time, uint32_t edges, struct wl_surface *surface, diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index b30cd4ab16..1e13f30b64 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -47,6 +47,12 @@ #include "qwaylandscreen.h" #include + +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT +#include "windowmanager_integration/qwaylandwindowmanagerintegration.h" +#endif + +#include #include #include @@ -60,6 +66,10 @@ QWaylandWindow::QWaylandWindow(QWindow *window) static WId id = 1; mWindowId = id++; +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT + mDisplay->windowManagerIntegration()->mapClientToProcess(qApp->applicationPid()); +#endif + mSurface = mDisplay->createSurface(this); } @@ -120,7 +130,6 @@ void QWaylandWindow::attach(QWaylandBuffer *buffer) } } - void QWaylandWindow::damage(const QRegion ®ion) { //We have to do sync stuff before calling damage, or we might diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index 1a9368f13c..e49c73bfae 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -45,8 +45,10 @@ QT += core-private QT += widgets-private include ($$PWD/gl_integration/gl_integration.pri) +include ($$PWD/windowmanager_integration/windowmanager_integration.pri) include (../fontdatabases/genericunix/genericunix.pri) target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target + diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanager-client-protocol.h b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanager-client-protocol.h new file mode 100644 index 0000000000..ec776c5f87 --- /dev/null +++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanager-client-protocol.h @@ -0,0 +1,82 @@ +/* + * Copyright © 2010 Kristian Høgsberg + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + + +#ifndef WAYLAND_WINDOWMANAGER_CLIENT_PROTOCOL_H +#define WAYLAND_WINDOWMANAGER_CLIENT_PROTOCOL_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include "wayland-util.h" + +struct wl_client; + +struct wl_windowmanager; + +extern const struct wl_interface wl_windowmanager_interface; + +#define WL_WINDOWMANAGER_MAP_CLIENT_TO_PROCESS 0 + +static inline struct wl_windowmanager * +wl_windowmanager_create(struct wl_display *display, uint32_t id, uint32_t /*version*/) +{ + // ### does not run without latest wayland. must be enabled later + //wl_display_bind(display, id, "wl_windowmanager", version); + + return (struct wl_windowmanager *) + wl_proxy_create_for_id(display, &wl_windowmanager_interface, id); +} + +static inline void +wl_windowmanager_set_user_data(struct wl_windowmanager *wl_windowmanager, void *user_data) +{ + wl_proxy_set_user_data((struct wl_proxy *) wl_windowmanager, user_data); +} + +static inline void * +wl_windowmanager_get_user_data(struct wl_windowmanager *wl_windowmanager) +{ + return wl_proxy_get_user_data((struct wl_proxy *) wl_windowmanager); +} + +static inline void +wl_windowmanager_destroy(struct wl_windowmanager *wl_windowmanager) +{ + wl_proxy_destroy((struct wl_proxy *) wl_windowmanager); +} + +static inline void +wl_windowmanager_map_client_to_process(struct wl_windowmanager *wl_windowmanager, uint32_t processid) +{ + wl_proxy_marshal((struct wl_proxy *) wl_windowmanager, + WL_WINDOWMANAGER_MAP_CLIENT_TO_PROCESS, processid); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp new file mode 100644 index 0000000000..b93e6d2f70 --- /dev/null +++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qwaylandwindowmanagerintegration.h" +#include "qwaylandwindowmanager-client-protocol.h" + +#include + +QWaylandWindowManagerIntegration *QWaylandWindowManagerIntegration::createIntegration(QWaylandDisplay *waylandDisplay) +{ + return new QWaylandWindowManagerIntegration(waylandDisplay); +} + +QWaylandWindowManagerIntegration::QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay) + : mWaylandDisplay(waylandDisplay) + , mWaylandWindowManager(0) +{ + wl_display_add_global_listener(mWaylandDisplay->wl_display(), + QWaylandWindowManagerIntegration::wlHandleListenerGlobal, + this); +} + +QWaylandWindowManagerIntegration::~QWaylandWindowManagerIntegration() +{ + +} + +struct wl_windowmanager *QWaylandWindowManagerIntegration::windowManager() const +{ + return mWaylandWindowManager; +} + +void QWaylandWindowManagerIntegration::wlHandleListenerGlobal(wl_display *display, uint32_t id, const char *interface, + uint32_t version, void *data) +{ + if (strcmp(interface, "wl_windowmanager") == 0) { + QWaylandWindowManagerIntegration *integration = static_cast(data); + integration->mWaylandWindowManager = wl_windowmanager_create(display,id, version); + } +} + +void QWaylandWindowManagerIntegration::mapClientToProcess(long long processId) +{ + if (mWaylandWindowManager) + wl_windowmanager_map_client_to_process(mWaylandWindowManager, (uint32_t) processId); +} + diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.h b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.h new file mode 100644 index 0000000000..01a7bdd960 --- /dev/null +++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.h @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QWAYLANDWINDOWMANAGERINTEGRATION_H +#define QWAYLANDWINDOWMANAGERINTEGRATION_H + +#include +#include "wayland-client.h" +#include "qwaylanddisplay.h" + +class QWaylandWindowManagerIntegration +{ +public: + explicit QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay); + virtual ~QWaylandWindowManagerIntegration(); + static QWaylandWindowManagerIntegration *createIntegration(QWaylandDisplay *waylandDisplay); + struct wl_windowmanager *windowManager() const; + + void mapSurfaceToProcess(struct wl_surface *surface, long long processId); + void mapClientToProcess(long long processId); + +private: + static void wlHandleListenerGlobal(wl_display *display, uint32_t id, + const char *interface, uint32_t version, void *data); + +private: + QWaylandDisplay *mWaylandDisplay; + struct wl_windowmanager *mWaylandWindowManager; +}; + +#endif // QWAYLANDWINDOWMANAGERINTEGRATION_H diff --git a/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c b/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c new file mode 100644 index 0000000000..48049d8571 --- /dev/null +++ b/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c @@ -0,0 +1,36 @@ +/* + * Copyright © 2010 Kristian Høgsberg + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + + +#include +#include +#include "wayland-util.h" + +static const struct wl_message wl_windowmanager_requests[] = { + { "map_client_to_process", "u", NULL }, +}; + +WL_EXPORT const struct wl_interface wl_windowmanager_interface = { + "wl_windowmanager", 1, + ARRAY_LENGTH(wl_windowmanager_requests), wl_windowmanager_requests, + 0, NULL, +}; diff --git a/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri new file mode 100644 index 0000000000..a28218272d --- /dev/null +++ b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri @@ -0,0 +1,16 @@ +DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT + +contains(DEFINES, QT_WAYLAND_WINDOWMANAGER_SUPPORT) { + + HEADERS += \ + $$PWD/qwaylandwindowmanager-client-protocol.h \ + $$PWD/qwaylandwindowmanagerintegration.h + + SOURCES += \ + $$PWD/qwaylandwindowmanagerintegration.cpp \ + $$PWD/wayland-windowmanager-protocol.c + +} + + + diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 074fdafe87..2a7594ee9b 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -140,8 +140,9 @@ void QXcbWindow::create() xcb_parent_id = static_cast(parent())->xcb_window(); #if defined(XCB_USE_GLX) || defined(XCB_USE_EGL) - if (window()->surfaceType() == QWindow::OpenGLSurface + if ((window()->surfaceType() == QWindow::OpenGLSurface && QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) + || window()->requestedWindowFormat().hasAlpha()) { #if defined(XCB_USE_GLX) XVisualInfo *visualInfo = qglx_findVisualInfo(DISPLAY_FROM_XCB(m_screen),m_screen->screenNumber(), window()->requestedWindowFormat()); @@ -159,13 +160,17 @@ void QXcbWindow::create() visualInfo = XGetVisualInfo(DISPLAY_FROM_XCB(this), VisualIDMask, &visualInfoTemplate, &matchingCount); #endif //XCB_USE_GLX if (visualInfo) { + m_depth = visualInfo->depth; + m_format = (m_depth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; Colormap cmap = XCreateColormap(DISPLAY_FROM_XCB(this), xcb_parent_id, visualInfo->visual, AllocNone); XSetWindowAttributes a; + a.background_pixel = WhitePixel(DISPLAY_FROM_XCB(this), m_screen->screenNumber()); + a.border_pixel = BlackPixel(DISPLAY_FROM_XCB(this), m_screen->screenNumber()); a.colormap = cmap; m_window = XCreateWindow(DISPLAY_FROM_XCB(this), xcb_parent_id, rect.x(), rect.y(), rect.width(), rect.height(), 0, visualInfo->depth, InputOutput, visualInfo->visual, - CWColormap, &a); + CWBackPixel|CWBorderPixel|CWColormap, &a); printf("created GL window: %x\n", m_window); } else { @@ -175,6 +180,8 @@ void QXcbWindow::create() #endif //defined(XCB_USE_GLX) || defined(XCB_USE_EGL) { m_window = xcb_generate_id(xcb_connection()); + m_depth = m_screen->screen()->root_depth; + m_format = (m_depth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; Q_XCB_CALL(xcb_create_window(xcb_connection(), XCB_COPY_FROM_PARENT, // depth -- same as root diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index a6ca3de565..ec6fe95dd8 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -44,6 +44,7 @@ #include #include +#include #include #include @@ -76,6 +77,8 @@ public: QPlatformGLContext *glContext() const; xcb_window_t xcb_window() const { return m_window; } + uint depth() const { return m_depth; } + QImage::Format format() const { return m_format; } void handleExposeEvent(const xcb_expose_event_t *event); void handleClientMessageEvent(const xcb_client_message_event_t *event); @@ -116,6 +119,9 @@ private: xcb_window_t m_window; QPlatformGLContext *m_context; + uint m_depth; + QImage::Format m_format; + xcb_sync_int64_t m_syncValue; xcb_sync_counter_t m_syncCounter; diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp index a371d2dd06..07b3763ff0 100644 --- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp +++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp @@ -54,11 +54,12 @@ #include #include +#include class QXcbShmImage : public QXcbObject { public: - QXcbShmImage(QXcbScreen *connection, const QSize &size); + QXcbShmImage(QXcbScreen *connection, const QSize &size, uint depth, QImage::Format format); ~QXcbShmImage() { destroy(); } QImage *image() { return &m_qimage; } @@ -81,7 +82,7 @@ private: QRegion m_dirty; }; -QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size) +QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QImage::Format format) : QXcbObject(screen->connection()) , m_gc(0) , m_gc_window(0) @@ -91,7 +92,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size) size.width(), size.height(), XCB_IMAGE_FORMAT_Z_PIXMAP, - screen->depth(), + depth, 0, ~0, 0); @@ -111,7 +112,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size) if (shmctl(m_shm_info.shmid, IPC_RMID, 0) == -1) qWarning() << "QXcbWindowSurface: Error while marking the shared memory segment to be destroyed"; - m_qimage = QImage( (uchar*) m_xcb_image->data, m_xcb_image->width, m_xcb_image->height, m_xcb_image->stride, screen->format()); + m_qimage = QImage( (uchar*) m_xcb_image->data, m_xcb_image->width, m_xcb_image->height, m_xcb_image->stride, format); } void QXcbShmImage::destroy() @@ -189,6 +190,16 @@ QPaintDevice *QXcbWindowSurface::paintDevice() void QXcbWindowSurface::beginPaint(const QRegion ®ion) { m_image->preparePaint(region); + + if (m_image->image()->hasAlphaChannel()) { + QPainter p(m_image->image()); + p.setCompositionMode(QPainter::CompositionMode_Source); + const QVector rects = region.rects(); + const QColor blank = Qt::transparent; + for (QVector::const_iterator it = rects.begin(); it != rects.end(); ++it) { + p.fillRect(*it, blank); + } + } } void QXcbWindowSurface::endPaint(const QRegion &) @@ -229,9 +240,10 @@ void QXcbWindowSurface::resize(const QSize &size) QWindowSurface::resize(size); QXcbScreen *screen = static_cast(QPlatformScreen::platformScreenForWindow(window())); + QXcbWindow* win = static_cast(window()->handle()); delete m_image; - m_image = new QXcbShmImage(screen, size); + m_image = new QXcbShmImage(screen, size, win->depth(), win->format()); Q_XCB_NOOP(connection()); m_syncingResize = true; diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp index 78f907abd2..b0c8bc9560 100644 --- a/src/plugins/platforms/xlib/qxlibintegration.cpp +++ b/src/plugins/platforms/xlib/qxlibintegration.cpp @@ -150,7 +150,7 @@ bool QXlibIntegration::hasOpenGL() const { #if !defined(QT_NO_OPENGL) #if !defined(QT_OPENGL_ES_2) - QXlibScreen *screen = static_cast(mScreens.at(0)); + QXlibScreen *screen = static_cast(mScreens.at(0)); return glXQueryExtension(screen->display()->nativeDisplay(), 0, 0) != 0; #else static bool eglHasbeenInitialized = false; diff --git a/src/plugins/platforms/xlib/qxlibscreen.cpp b/src/plugins/platforms/xlib/qxlibscreen.cpp index 7c8a367373..920116a614 100644 --- a/src/plugins/platforms/xlib/qxlibscreen.cpp +++ b/src/plugins/platforms/xlib/qxlibscreen.cpp @@ -41,6 +41,8 @@ #include "qxlibscreen.h" +#include + #include "qxlibcursor.h" #include "qxlibwindow.h" #include "qxlibkeyboard.h" @@ -54,8 +56,6 @@ #include -#include - QT_BEGIN_NAMESPACE static int (*original_x_errhandler)(Display *dpy, XErrorEvent *); @@ -201,7 +201,7 @@ QXlibScreen::QXlibScreen() #ifndef DONT_USE_MIT_SHM - Status MIT_SHM_extension_supported = XShmQueryExtension (mDisplay->nativeDisplay()); + int MIT_SHM_extension_supported = XShmQueryExtension (mDisplay->nativeDisplay()); Q_ASSERT(MIT_SHM_extension_supported == True); #endif original_x_errhandler = XSetErrorHandler(qt_x_errhandler); diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp index 61177812d5..7b562ea50d 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.cpp +++ b/src/plugins/platforms/xlib/qxlibstatic.cpp @@ -51,10 +51,6 @@ #include -#ifndef QT_NO_XFIXES -#include -#endif // QT_NO_XFIXES - static const char * x11_atomnames = { // window-manager <-> client protocols "WM_PROTOCOLS\0" diff --git a/src/plugins/platforms/xlib/qxlibstatic.h b/src/plugins/platforms/xlib/qxlibstatic.h index 8517de0bc2..fec2a16cdf 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.h +++ b/src/plugins/platforms/xlib/qxlibstatic.h @@ -135,6 +135,7 @@ typedef char *XPointer; #endif #ifndef QT_NO_XFIXES +#include typedef Bool (*PtrXFixesQueryExtension)(Display *, int *, int *); typedef Status (*PtrXFixesQueryVersion)(Display *, int *, int *); typedef void (*PtrXFixesSetCursorName)(Display *dpy, Cursor cursor, const char *name); diff --git a/src/plugins/platforms/xlib/qxlibwindow.cpp b/src/plugins/platforms/xlib/qxlibwindow.cpp index 9a05fc620d..50ea7b58e4 100644 --- a/src/plugins/platforms/xlib/qxlibwindow.cpp +++ b/src/plugins/platforms/xlib/qxlibwindow.cpp @@ -47,14 +47,6 @@ #include "qxlibstatic.h" #include "qxlibdisplay.h" -#include -#include -#include -#include - -#include -#include - #if !defined(QT_NO_OPENGL) #if !defined(QT_OPENGL_ES_2) #include "qglxintegration.h" @@ -66,6 +58,15 @@ #endif //QT_OPENGL_ES_2 #endif //QT_NO_OPENGL + +#include +#include +#include +#include + +#include +#include + //#define MYX11_DEBUG QT_BEGIN_NAMESPACE @@ -80,9 +81,10 @@ QXlibWindow::QXlibWindow(QWidget *window) int w = window->width(); int h = window->height(); - if(window->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL - && QApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL) ) { #if !defined(QT_NO_OPENGL) + if(window->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL + && QApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL) + || window->platformWindowFormat().alpha()) { #if !defined(QT_OPENGL_ES_2) XVisualInfo *visualInfo = qglx_findVisualInfo(mScreen->display()->nativeDisplay(),mScreen->xScreenNumber(),window->platformWindowFormat()); #else @@ -101,18 +103,28 @@ QXlibWindow::QXlibWindow(QWidget *window) visualInfo = XGetVisualInfo(mScreen->display()->nativeDisplay(), VisualIDMask, &visualInfoTemplate, &matchingCount); #endif //!defined(QT_OPENGL_ES_2) if (visualInfo) { - Colormap cmap = XCreateColormap(mScreen->display()->nativeDisplay(),mScreen->rootWindow(),visualInfo->visual,AllocNone); + mDepth = visualInfo->depth; + mFormat = (mDepth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; + mVisual = visualInfo->visual; + Colormap cmap = XCreateColormap(mScreen->display()->nativeDisplay(), mScreen->rootWindow(), visualInfo->visual, AllocNone); XSetWindowAttributes a; + a.background_pixel = WhitePixel(mScreen->display()->nativeDisplay(), mScreen->xScreenNumber()); + a.border_pixel = BlackPixel(mScreen->display()->nativeDisplay(), mScreen->xScreenNumber()); a.colormap = cmap; x_window = XCreateWindow(mScreen->display()->nativeDisplay(), mScreen->rootWindow(),x, y, w, h, 0, visualInfo->depth, InputOutput, visualInfo->visual, - CWColormap, &a); + CWBackPixel|CWBorderPixel|CWColormap, &a); } else { qFatal("no window!"); } + } else #endif //!defined(QT_NO_OPENGL) - } else { + { + mDepth = mScreen->depth(); + mFormat = (mDepth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; + mVisual = mScreen->defaultVisual(); + x_window = XCreateSimpleWindow(mScreen->display()->nativeDisplay(), mScreen->rootWindow(), x, y, w, h, 0 /*border_width*/, mScreen->blackPixel(), mScreen->whitePixel()); diff --git a/src/plugins/platforms/xlib/qxlibwindow.h b/src/plugins/platforms/xlib/qxlibwindow.h index 08694a5026..2d11224c23 100644 --- a/src/plugins/platforms/xlib/qxlibwindow.h +++ b/src/plugins/platforms/xlib/qxlibwindow.h @@ -122,6 +122,10 @@ public: Window xWindow() const; GC graphicsContext() const; + inline uint depth() const { return mDepth; } + QImage::Format format() const { return mFormat; } + Visual* visual() const { return mVisual; } + protected: QVector getNetWmState() const; void setMWMHints(const QXlibMWMHints &mwmhints); @@ -135,6 +139,10 @@ private: Window x_window; GC gc; + uint mDepth; + QImage::Format mFormat; + Visual* mVisual; + GC createGC(); QPlatformGLContext *mGLContext; diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp index 513f10dc6a..a917f452e8 100644 --- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp +++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp @@ -49,6 +49,8 @@ #include "qxlibscreen.h" #include "qxlibdisplay.h" +#include "qpainter.h" + # include # include # include @@ -80,20 +82,19 @@ void QXlibShmImageInfo::destroy() void QXlibWindowSurface::resizeShmImage(int width, int height) { + QXlibScreen *screen = QXlibScreen::testLiteScreenForWidget(window()); + QXlibWindow *win = static_cast(window()->platformWindow()); #ifdef DONT_USE_MIT_SHM - shm_img = QImage(width, height, QImage::Format_RGB32); + shm_img = QImage(width, height, win->format()); #else - QXlibScreen *screen = QXlibScreen::testLiteScreenForWidget(window()); if (image_info) image_info->destroy(); else image_info = new QXlibShmImageInfo(screen->display()->nativeDisplay()); - Visual *visual = screen->defaultVisual(); - - XImage *image = XShmCreateImage (screen->display()->nativeDisplay(), visual, 24, ZPixmap, 0, + XImage *image = XShmCreateImage (screen->display()->nativeDisplay(), win->visual(), win->depth(), ZPixmap, 0, &image_info->shminfo, width, height); @@ -109,7 +110,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height) Q_ASSERT(shm_attach_status == True); - shm_img = QImage( (uchar*) image->data, image->width, image->height, image->bytes_per_line, QImage::Format_RGB32 ); + shm_img = QImage( (uchar*) image->data, image->width, image->height, image->bytes_per_line, win->format() ); #endif painted = false; } @@ -160,11 +161,11 @@ void QXlibWindowSurface::flush(QWidget *widget, const QRegion ®ion, const QPo #ifdef DONT_USE_MIT_SHM // just convert the image every time... if (!shm_img.isNull()) { - Visual *visual = DefaultVisual(screen->display(), screen->xScreenNumber()); + QXlibWindow *win = static_cast(window()->platformWindow()); QImage image = shm_img; //img.convertToFormat( - XImage *xi = XCreateImage(screen->display(), visual, 24, ZPixmap, + XImage *xi = XCreateImage(screen->display(), win->visual(), win->depth(), ZPixmap, 0, (char *) image.scanLine(0), image.width(), image.height(), 32, image.bytesPerLine()); @@ -214,6 +215,16 @@ void QXlibWindowSurface::beginPaint(const QRegion ®ion) { Q_UNUSED(region); resizeBuffer(size()); + + if (shm_img.hasAlphaChannel()) { + QPainter p(&shm_img); + p.setCompositionMode(QPainter::CompositionMode_Source); + const QVector rects = region.rects(); + const QColor blank = Qt::transparent; + for (QVector::const_iterator it = rects.begin(); it != rects.end(); ++it) { + p.fillRect(*it, blank); + } + } } void QXlibWindowSurface::endPaint(const QRegion ®ion) diff --git a/src/qbase.pri b/src/qbase.pri index 03f85cf931..cf02978853 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -174,7 +174,7 @@ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code -DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION +DEFINES *= QT_USE_QSTRINGBUILDER TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp index 6270e35d54..7950901055 100644 --- a/src/uitools/quiloader.cpp +++ b/src/uitools/quiloader.cpp @@ -653,7 +653,7 @@ QUiLoader::~QUiLoader() Loads a form from the given \a device and creates a new widget with the given \a parentWidget to hold its contents. - \sa createWidget() + \sa createWidget(), errorString() */ QWidget *QUiLoader::load(QIODevice *device, QWidget *parentWidget) { @@ -936,6 +936,19 @@ bool QUiLoader::isTranslationEnabled() const return d->builder.trEnabled; } +/*! + Returns a human-readable description of the last error occurred in load(). + + \since 5.0 + \sa load() +*/ + +QString QUiLoader::errorString() const +{ + Q_D(const QUiLoader); + return d->builder.errorString(); +} + QT_END_NAMESPACE #include "quiloader.moc" diff --git a/src/uitools/quiloader.h b/src/uitools/quiloader.h index 214342ef83..0c21a276ee 100644 --- a/src/uitools/quiloader.h +++ b/src/uitools/quiloader.h @@ -90,6 +90,8 @@ public: void setTranslationEnabled(bool enabled); bool isTranslationEnabled() const; + QString errorString() const; + private: QScopedPointer d_ptr; Q_DECLARE_PRIVATE(QUiLoader) diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index 6721fdbb6a..02487679bf 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -96,6 +96,12 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO win->setWindowFlags(data.window_flags); win->setGeometry(q->geometry()); + if (q->testAttribute(Qt::WA_TranslucentBackground)) { + QWindowFormat format = win->requestedWindowFormat(); + format.setAlphaBufferSize(8); + win->setWindowFormat(format); + } + if (QWidget *nativeParent = q->nativeParentWidget()) { if (nativeParent->windowHandle()) win->setParent(nativeParent->windowHandle()); @@ -396,6 +402,7 @@ void QWidgetPrivate::show_sys() surface->resize(geomRect.size()); } } + if (window) window->setVisible(true); } diff --git a/src/widgets/platforms/x11/qapplication_x11.cpp b/src/widgets/platforms/x11/qapplication_x11.cpp index 20542ea328..d1f9eb1b8a 100644 --- a/src/widgets/platforms/x11/qapplication_x11.cpp +++ b/src/widgets/platforms/x11/qapplication_x11.cpp @@ -1740,8 +1740,8 @@ void qt_init(QApplicationPrivate *priv, int, } else { // Qt controls everything (default) - if (QApplication::testAttribute(Qt::AA_X11InitThreads)) - XInitThreads(); + // With the threaded QML renderer, we always need this. + XInitThreads(); // Set application name and class char *app_class = 0; diff --git a/tests/arthur/common/common.pro b/tests/arthur/common/common.pro index 9510f87f06..2a1f8f04fb 100644 --- a/tests/arthur/common/common.pro +++ b/tests/arthur/common/common.pro @@ -6,7 +6,7 @@ #include(../arthurtester.pri) #TEMPLATE = lib #CONFIG += static -#QT += xml opengl svg qt3support +#QT += xml opengl svg #build_all:!build_pass { # CONFIG -= build_all diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp index 9273142905..a6762082cb 100644 --- a/tests/arthur/common/paintcommands.cpp +++ b/tests/arthur/common/paintcommands.cpp @@ -49,10 +49,6 @@ #include #include -#ifdef QT3_SUPPORT -#include -#endif - #ifndef QT_NO_OPENGL #include #endif @@ -364,33 +360,6 @@ void PaintCommands::staticInit() "^gradient_setCoordinateMode\\s+(\\w*)$", "gradient_setCoordinateMode ", "gradient_setCoordinateMode ObjectBoundingMode"); -#ifdef QT3_SUPPORT - DECL_PAINTCOMMANDSECTION("qt3 drawing ops"); - DECL_PAINTCOMMAND("qt3_drawArc", command_qt3_drawArc, - "^qt3_drawArc\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawArc \n - angles are expressed in 1/16th of degree", - "qt3_drawArc 10 10 20 20 0 5760"); - DECL_PAINTCOMMAND("qt3_drawChord", command_qt3_drawChord, - "^qt3_drawChord\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawChord \n - angles are expressed in 1/16th of degree", - "qt3_drawChord 10 10 20 20 0 5760"); - DECL_PAINTCOMMAND("qt3_drawEllipse", command_qt3_drawEllipse, - "^qt3_drawEllipse\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawEllipse ", - "qt3_drawEllipse 10 10 20 20"); - DECL_PAINTCOMMAND("qt3_drawPie", command_qt3_drawPie, - "^qt3_drawPie\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawPie \n - angles are expressed in 1/16th of degree", - "qt3_drawPie 10 10 20 20 0 5760"); - DECL_PAINTCOMMAND("qt3_drawRect", command_qt3_drawRect, - "^qt3_drawRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawRect ", - "qt3_drawRect 10 10 20 20"); - DECL_PAINTCOMMAND("qt3_drawRoundRect", command_qt3_drawRoundRect, - "^qt3_drawRoundRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s*(-?\\w)?\\s*(-?\\w)?$", - "qt3_drawRoundRect [rx] [ry]", - "qt3_drawRoundRect 10 10 20 20 3 3"); -#endif DECL_PAINTCOMMANDSECTION("drawing ops"); DECL_PAINTCOMMAND("drawPoint", command_drawPoint, "^drawPoint\\s+(-?[\\w.]*)\\s+(-?[\\w.]*)$", @@ -1271,123 +1240,6 @@ void PaintCommands::command_drawArc(QRegExp re) m_painter->drawArc(x, y, w, h, angle, sweep); } -#ifdef QT3_SUPPORT -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawRect(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawRect(%d, %d, %d, %d)\n", x, y, w, h); - - static_cast(m_painter)->drawRect(x, y, w, h); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawRoundRect(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int xrnd = caps.at(5).isEmpty() ? 25 : convertToInt(caps.at(5)); - int yrnd = caps.at(6).isEmpty() ? 25 : convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawRoundRect(%d, %d, %d, %d), %d, %d\n", x, y, w, h, xrnd, yrnd); - - static_cast(m_painter)->drawRoundRect(x, y, w, h, xrnd, yrnd); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawEllipse(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawEllipse(%d, %d, %d, %d)\n", x, y, w, h); - - static_cast(m_painter)->drawEllipse(x, y, w, h); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawPie(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int angle = convertToInt(caps.at(5)); - int sweep = convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawPie(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep); - - static_cast(m_painter)->drawPie(x, y, w, h, angle, sweep); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawChord(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int angle = convertToInt(caps.at(5)); - int sweep = convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawChord(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep); - - static_cast(m_painter)->drawChord(x, y, w, h, angle, sweep); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawArc(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int angle = convertToInt(caps.at(5)); - int sweep = convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawArc(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep); - - static_cast(m_painter)->drawArc(x, y, w, h, angle, sweep); -#endif -} -#endif //QT3_SUPPORT /***************************************************************************************************/ void PaintCommands::command_drawText(QRegExp re) { diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h index 08c0e25a7b..786ff64943 100644 --- a/tests/arthur/common/paintcommands.h +++ b/tests/arthur/common/paintcommands.h @@ -185,14 +185,6 @@ private: void command_gradient_setCoordinateMode(QRegExp re); // commands: drawing ops -#ifdef QT3_SUPPORT - void command_qt3_drawArc(QRegExp re); - void command_qt3_drawChord(QRegExp re); - void command_qt3_drawEllipse(QRegExp re); - void command_qt3_drawPie(QRegExp re); - void command_qt3_drawRect(QRegExp re); - void command_qt3_drawRoundRect(QRegExp re); -#endif void command_drawArc(QRegExp re); void command_drawChord(QRegExp re); void command_drawConvexPolygon(QRegExp re); diff --git a/tests/arthur/data/qps/sizes.qps b/tests/arthur/data/qps/sizes.qps index 30f6557538..c585e5a01f 100644 --- a/tests/arthur/data/qps/sizes.qps +++ b/tests/arthur/data/qps/sizes.qps @@ -14,16 +14,6 @@ drawRect 120 0 16 16 drawRect 140 0 17 17 drawRect 160 0 18 18 drawRect 180 0 19 19 -qt3_drawRect 200 0 10 10 -qt3_drawRect 220 0 11 11 -qt3_drawRect 240 0 12 12 -qt3_drawRect 260 0 13 13 -qt3_drawRect 280 0 14 14 -qt3_drawRect 300 0 15 15 -qt3_drawRect 320 0 16 16 -qt3_drawRect 340 0 17 17 -qt3_drawRect 360 0 18 18 -qt3_drawRect 380 0 19 19 drawEllipse 0 20 10 10 drawEllipse 20 20 11 11 @@ -35,16 +25,6 @@ drawEllipse 120 20 16 16 drawEllipse 140 20 17 17 drawEllipse 160 20 18 18 drawEllipse 180 20 19 19 -qt3_drawEllipse 200 20 10 10 -qt3_drawEllipse 220 20 11 11 -qt3_drawEllipse 240 20 12 12 -qt3_drawEllipse 260 20 13 13 -qt3_drawEllipse 280 20 14 14 -qt3_drawEllipse 300 20 15 15 -qt3_drawEllipse 320 20 16 16 -qt3_drawEllipse 340 20 17 17 -qt3_drawEllipse 360 20 18 18 -qt3_drawEllipse 380 20 19 19 drawRoundRect 0 40 10 10 drawRoundRect 20 40 11 11 @@ -56,16 +36,6 @@ drawRoundRect 120 40 16 16 drawRoundRect 140 40 17 17 drawRoundRect 160 40 18 18 drawRoundRect 180 40 19 19 -qt3_drawRoundRect 200 40 10 10 -qt3_drawRoundRect 220 40 11 11 -qt3_drawRoundRect 240 40 12 12 -qt3_drawRoundRect 260 40 13 13 -qt3_drawRoundRect 280 40 14 14 -qt3_drawRoundRect 300 40 15 15 -qt3_drawRoundRect 320 40 16 16 -qt3_drawRoundRect 340 40 17 17 -qt3_drawRoundRect 360 40 18 18 -qt3_drawRoundRect 380 40 19 19 drawPie 0 60 10 10 0 4320 drawPie 20 60 11 11 0 4320 @@ -77,16 +47,6 @@ drawPie 120 60 16 16 0 4320 drawPie 140 60 17 17 0 4320 drawPie 160 60 18 18 0 4320 drawPie 180 60 19 19 0 4320 -qt3_drawPie 200 60 10 10 0 4320 -qt3_drawPie 220 60 11 11 0 4320 -qt3_drawPie 240 60 12 12 0 4320 -qt3_drawPie 260 60 13 13 0 4320 -qt3_drawPie 280 60 14 14 0 4320 -qt3_drawPie 300 60 15 15 0 4320 -qt3_drawPie 320 60 16 16 0 4320 -qt3_drawPie 340 60 17 17 0 4320 -qt3_drawPie 360 60 18 18 0 4320 -qt3_drawPie 380 60 19 19 0 4320 drawArc 0 80 10 10 0 4320 drawArc 20 80 11 11 0 4320 @@ -98,16 +58,6 @@ drawArc 120 80 16 16 0 4320 drawArc 140 80 17 17 0 4320 drawArc 160 80 18 18 0 4320 drawArc 180 80 19 19 0 4320 -qt3_drawArc 200 80 10 10 0 4320 -qt3_drawArc 220 80 11 11 0 4320 -qt3_drawArc 240 80 12 12 0 4320 -qt3_drawArc 260 80 13 13 0 4320 -qt3_drawArc 280 80 14 14 0 4320 -qt3_drawArc 300 80 15 15 0 4320 -qt3_drawArc 320 80 16 16 0 4320 -qt3_drawArc 340 80 17 17 0 4320 -qt3_drawArc 360 80 18 18 0 4320 -qt3_drawArc 380 80 19 19 0 4320 drawChord 0 100 10 10 0 4320 drawChord 20 100 11 11 0 4320 @@ -119,16 +69,6 @@ drawChord 120 100 16 16 0 4320 drawChord 140 100 17 17 0 4320 drawChord 160 100 18 18 0 4320 drawChord 180 100 19 19 0 4320 -qt3_drawChord 200 100 10 10 0 4320 -qt3_drawChord 220 100 11 11 0 4320 -qt3_drawChord 240 100 12 12 0 4320 -qt3_drawChord 260 100 13 13 0 4320 -qt3_drawChord 280 100 14 14 0 4320 -qt3_drawChord 300 100 15 15 0 4320 -qt3_drawChord 320 100 16 16 0 4320 -qt3_drawChord 340 100 17 17 0 4320 -qt3_drawChord 360 100 18 18 0 4320 -qt3_drawChord 380 100 19 19 0 4320 end_block diff --git a/tests/arthur/datagenerator/datagenerator.pro b/tests/arthur/datagenerator/datagenerator.pro index 9da6fcd5c5..2c320a3418 100644 --- a/tests/arthur/datagenerator/datagenerator.pro +++ b/tests/arthur/datagenerator/datagenerator.pro @@ -8,9 +8,8 @@ DEPENDPATH += . INCLUDEPATH += . DESTDIR = ../bin -QT += svg xml +QT += svg xml core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += datagenerator.h \ diff --git a/tests/arthur/htmlgenerator/htmlgenerator.pro b/tests/arthur/htmlgenerator/htmlgenerator.pro index 4a1c8ba89b..4f5d5c8c16 100644 --- a/tests/arthur/htmlgenerator/htmlgenerator.pro +++ b/tests/arthur/htmlgenerator/htmlgenerator.pro @@ -9,9 +9,8 @@ DESTDIR = ../bin CONFIG += console -QT += svg xml +QT += svg xml core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += htmlgenerator.h diff --git a/tests/arthur/lance/lance.pro b/tests/arthur/lance/lance.pro index 56b7f25b81..8f3407cfc9 100644 --- a/tests/arthur/lance/lance.pro +++ b/tests/arthur/lance/lance.pro @@ -10,7 +10,6 @@ SOURCES += interactivewidget.cpp main.cpp RESOURCES += icons.qrc contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support symbian*: { testData.files = $$QT_BUILD_TREE/tests/arthur/data/qps @@ -18,6 +17,6 @@ symbian*: { DEPLOYMENT += testData } -QT += xml svg +QT += xml svg core-private gui-private diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp index 2bda932130..9e8e07f96d 100644 --- a/tests/arthur/lance/main.cpp +++ b/tests/arthur/lance/main.cpp @@ -137,14 +137,6 @@ static void displayCommands() " drawText x y \"text\"\n" " drawTiledPixmap pixmapfile x y width height sx sy\n" "\n" - "Compat functions for Qt 3:\n" - " qt3_drawArc x y width height angle sweep\n" - " qt3_drawChord x y width height angle sweep\n" - " qt3_drawEllipse x y width height\n" - " qt3_drawPie x y width height angle sweep\n" - " qt3_drawRect x y width height\n" - " qt3_drawRoundRect x y width height xfactor yfactor\n" - "\n" "Path commands:\n" " path_addEllipse pathname x y width height\n" " path_addPolygon pathname [ x1 y1 x2 y2 ... ] winding?\n" diff --git a/tests/arthur/performancediff/performancediff.pro b/tests/arthur/performancediff/performancediff.pro index 15d5ec5956..8c1fb98047 100644 --- a/tests/arthur/performancediff/performancediff.pro +++ b/tests/arthur/performancediff/performancediff.pro @@ -9,9 +9,8 @@ DESTDIR = ../bin CONFIG += console -QT += xml svg +QT += xml svg core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += performancediff.h diff --git a/tests/arthur/shower/shower.pro b/tests/arthur/shower/shower.pro index c02ded0865..f4f8d47809 100644 --- a/tests/arthur/shower/shower.pro +++ b/tests/arthur/shower/shower.pro @@ -7,9 +7,8 @@ DEPENDPATH += . INCLUDEPATH += . DESTDIR = ../bin -QT += xml svg +QT += xml svg core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += shower.h diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp index b1ea32629b..18a32fd486 100644 --- a/tests/auto/collections/tst_collections.cpp +++ b/tests/auto/collections/tst_collections.cpp @@ -100,10 +100,6 @@ void foo() #include "qvector.h" #include "qqueue.h" -#ifdef QT3_SUPPORT -#include "q3cleanuphandler.h" -#endif - template class QList; //TESTED_FILES= @@ -133,7 +129,6 @@ private slots: void cache(); void regexp(); void pair(); - void cleanupHandler(); void sharableQList(); void sharableQLinkedList(); void sharableQVector(); @@ -2191,14 +2186,7 @@ void tst_Collections::qstring() QVERIFY(s.toLatin1() == "first"); s = "second"; QVERIFY(s.toLatin1() == "second"); -#ifdef QT3_SUPPORT - const char* cache = s.latin1(); - QVERIFY(cache == s.latin1()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.latin1() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toLatin1().size() == 0); QVERIFY(s.toLatin1().isEmpty()); @@ -2208,14 +2196,7 @@ void tst_Collections::qstring() QVERIFY(s.toUtf8() == "first-utf8"); s = "second-utf8"; QVERIFY(s.toUtf8() == "second-utf8"); -#ifdef QT3_SUPPORT - cache = s.utf8(); - QVERIFY(cache == s.utf8()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.utf8() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toUtf8().size() == 0); QVERIFY(s.toUtf8().isEmpty()); @@ -2225,14 +2206,7 @@ void tst_Collections::qstring() QVERIFY(s.toUtf8() == "first-utf8"); s = "second-utf8"; QVERIFY(s.toUtf8() == "second-utf8"); -#ifdef QT3_SUPPORT - cache = s.utf8(); - QVERIFY(cache == s.utf8()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.utf8() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toUtf8().size() == 0); QVERIFY(s.toUtf8().isEmpty()); @@ -2242,14 +2216,7 @@ void tst_Collections::qstring() QVERIFY(s.toLocal8Bit() == "first-local8Bit"); s = "second-local8Bit"; QVERIFY(s.toLocal8Bit() == "second-local8Bit"); -#ifdef QT3_SUPPORT - cache = s.local8Bit(); - QVERIFY(cache == s.local8Bit()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.local8Bit() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toLocal8Bit().size() == 0); QVERIFY(s.toLocal8Bit().isEmpty()); @@ -2258,14 +2225,7 @@ void tst_Collections::qstring() QVERIFY(s.toAscii() == "first-ascii"); s = "second-ascii"; QVERIFY(s.toAscii() == "second-ascii"); -#ifdef QT3_SUPPORT - cache = s.ascii(); - QVERIFY(cache == s.ascii()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.ascii() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toAscii().size() == 0); QVERIFY(s.toAscii().isEmpty()); @@ -2508,24 +2468,6 @@ void tst_Collections::pair() QVERIFY(!(a > a || b > b || c > c || d > d || e > e)); } -void tst_Collections::cleanupHandler() -{ -#ifdef QT3_SUPPORT - LargeStatic * f1 = 0; - LargeStatic * f2 = 0; - { - Q3CleanupHandler cleanup; - f1 = new LargeStatic; - f2 = new LargeStatic; - cleanup.add(&f1); - cleanup.add(&f2); - } - QVERIFY(f1 == 0 && f2 == 0); -#else - QSKIP("No Qt3 support", SkipAll); -#endif -} - /* These test that Java-style mutable iterators don't trash shared copy (the setSharable() mechanism). diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index e7e516eddd..d167228b7b 100644 --- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -60,7 +60,7 @@ QT_USE_NAMESPACE #include "3rdparty/memcheck.h" #endif -class tst_ExceptionSafetyObjects: public QObject +class tst_ExceptionSafety_Objects: public QObject { Q_OBJECT @@ -156,7 +156,7 @@ struct DirCreator : public AbstractTester } }; -void tst_ExceptionSafetyObjects::objects_data() +void tst_ExceptionSafety_Objects::objects_data() { QTest::addColumn("objectCreator"); @@ -164,12 +164,12 @@ void tst_ExceptionSafetyObjects::objects_data() NEWROW(QObject); NEWROW(QBuffer); NEWROW(QFile); + NEWROW(QFSFileEngine); NEWROW(QProcess); NEWROW(QSettings); NEWROW(QThread); NEWROW(QThreadPool); NEWROW(QTranslator); - NEWROW(QFSFileEngine); #define NEWROW2(T, CREATOR) QTest::newRow(#T) << static_cast(new CREATOR) NEWROW2(QBitArray, BitArrayCreator); @@ -177,7 +177,6 @@ void tst_ExceptionSafetyObjects::objects_data() NEWROW2(QCryptographicHash, CryptographicHashCreator); NEWROW2(QDataStream, DataStreamCreator); NEWROW2(QDir, DirCreator); - } // create and destructs an object, and lets each and every allocation @@ -274,9 +273,9 @@ public: } }; -QtMsgHandler tst_ExceptionSafetyObjects::testMessageHandler; +QtMsgHandler tst_ExceptionSafety_Objects::testMessageHandler; -void tst_ExceptionSafetyObjects::safeMessageHandler(QtMsgType type, const char *msg) +void tst_ExceptionSafety_Objects::safeMessageHandler(QtMsgType type, const char *msg) { // this temporarily suspends OOM testing while handling a message int currentIndex = mallocFailIndex; @@ -301,7 +300,7 @@ void debugUnexpected() (*defaultUnexpected)(); } -void tst_ExceptionSafetyObjects::initTestCase() +void tst_ExceptionSafety_Objects::initTestCase() { // set handlers for bad exception cases, you might want to step in and breakpoint the default handlers too defaultTerminate = std::set_terminate(&debugTerminate); @@ -345,17 +344,25 @@ void tst_ExceptionSafetyObjects::initTestCase() QCOMPARE(malloc2Failed, 1); } -void tst_ExceptionSafetyObjects::cleanupTestCase() +void tst_ExceptionSafety_Objects::cleanupTestCase() { qInstallMsgHandler(testMessageHandler); } -void tst_ExceptionSafetyObjects::objects() +void tst_ExceptionSafety_Objects::objects() { + QLatin1String tag = QLatin1String(QTest::currentDataTag()); + if (tag == QLatin1String("QFile") + || tag == QLatin1String("QProcess") + || tag == QLatin1String("QSettings") + || tag == QLatin1String("QThread") + || tag == QLatin1String("QThreadPool")) + QSKIP("This type of object is not currently strongly exception safe", SkipSingle); + QFETCH(AbstractTester *, objectCreator); doOOMTest(*objectCreator, 0); - + delete objectCreator; } @@ -364,7 +371,8 @@ struct WidgetCreator : public AbstractTester { void operator()(QObject *parent) { - Q_ASSERT(!parent || parent->isWidgetType()); + if (parent && !parent->isWidgetType()) + qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO); QScopedPointer ptr(parent ? new T(static_cast(parent)) : new T); } }; @@ -374,7 +382,8 @@ template <> struct WidgetCreator : public AbstractTester { void operator()(QObject *parent) { - Q_ASSERT(!parent || parent->isWidgetType()); + if (parent && !parent->isWidgetType()) + qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO); QScopedPointer ptr(new QSizeGrip(static_cast(parent))); } }; @@ -384,17 +393,18 @@ template <> struct WidgetCreator : public AbstractTester { void operator()(QObject *parent) { - Q_ASSERT(!parent || parent->isWidgetType()); + if (parent && !parent->isWidgetType()) + qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO); QScopedPointer ptr(new QDesktopWidget()); } }; -void tst_ExceptionSafetyObjects::widgets_data() +void tst_ExceptionSafety_Objects::widgets_data() { #ifdef Q_OS_SYMBIAN // Initialise the S60 rasteriser, which crashes if started while out of memory - QImage image(20, 20, QImage::Format_RGB32); - QPainter p(&image); - p.drawText(0, 15, "foo"); + QImage image(20, 20, QImage::Format_RGB32); + QPainter p(&image); + p.drawText(0, 15, "foo"); #endif QTest::addColumn("widgetCreator"); @@ -405,23 +415,27 @@ void tst_ExceptionSafetyObjects::widgets_data() NEWROW(QWidget); NEWROW(QButtonGroup); - NEWROW(QDesktopWidget); NEWROW(QCheckBox); + NEWROW(QColumnView); NEWROW(QComboBox); NEWROW(QCommandLinkButton); NEWROW(QDateEdit); NEWROW(QDateTimeEdit); + NEWROW(QDesktopWidget); NEWROW(QDial); NEWROW(QDoubleSpinBox); NEWROW(QFocusFrame); NEWROW(QFontComboBox); NEWROW(QFrame); NEWROW(QGroupBox); - NEWROW(QLCDNumber); NEWROW(QLabel); NEWROW(QLCDNumber); NEWROW(QLineEdit); + NEWROW(QListView); + NEWROW(QListWidget); + NEWROW(QMainWindow); NEWROW(QMenu); + NEWROW(QMenuBar); NEWROW(QPlainTextEdit); NEWROW(QProgressBar); NEWROW(QPushButton); @@ -435,28 +449,58 @@ void tst_ExceptionSafetyObjects::widgets_data() NEWROW(QStackedWidget); NEWROW(QStatusBar); NEWROW(QTabBar); + NEWROW(QTableView); + NEWROW(QTableWidget); NEWROW(QTabWidget); NEWROW(QTextBrowser); NEWROW(QTextEdit); NEWROW(QTimeEdit); + NEWROW(QToolBar); NEWROW(QToolBox); NEWROW(QToolButton); - NEWROW(QStatusBar); - NEWROW(QToolBar); - NEWROW(QMenuBar); - NEWROW(QMainWindow); - NEWROW(QWorkspace); - NEWROW(QColumnView); - NEWROW(QListView); - NEWROW(QListWidget); - NEWROW(QTableView); - NEWROW(QTableWidget); NEWROW(QTreeView); NEWROW(QTreeWidget); + NEWROW(QWorkspace); } -void tst_ExceptionSafetyObjects::widgets() +void tst_ExceptionSafety_Objects::widgets() { + QLatin1String tag = QLatin1String(QTest::currentDataTag()); + if (tag == QLatin1String("QColumnView") + || tag == QLatin1String("QComboBox") + || tag == QLatin1String("QCommandLinkButton") + || tag == QLatin1String("QDateEdit") + || tag == QLatin1String("QDateTimeEdit") + || tag == QLatin1String("QDesktopWidget") + || tag == QLatin1String("QDoubleSpinBox") + || tag == QLatin1String("QFontComboBox") + || tag == QLatin1String("QGroupBox") + || tag == QLatin1String("QLineEdit") + || tag == QLatin1String("QListView") + || tag == QLatin1String("QListWidget") + || tag == QLatin1String("QMainWindow") + || tag == QLatin1String("QMenu") + || tag == QLatin1String("QMenuBar") + || tag == QLatin1String("QPlainTextEdit") + || tag == QLatin1String("QProgressBar") + || tag == QLatin1String("QPushButton") + || tag == QLatin1String("QScrollArea") + || tag == QLatin1String("QSpinBox") + || tag == QLatin1String("QStackedWidget") + || tag == QLatin1String("QStatusBar") + || tag == QLatin1String("QTableView") + || tag == QLatin1String("QTableWidget") + || tag == QLatin1String("QTabWidget") + || tag == QLatin1String("QTextBrowser") + || tag == QLatin1String("QTextEdit") + || tag == QLatin1String("QTimeEdit") + || tag == QLatin1String("QToolBar") + || tag == QLatin1String("QToolBox") + || tag == QLatin1String("QTreeView") + || tag == QLatin1String("QTreeWidget") + || tag == QLatin1String("QWorkspace")) + QSKIP("This type of widget is not currently strongly exception safe", SkipSingle); + QFETCH(AbstractTester *, widgetCreator); doOOMTest(*widgetCreator, 0, 00000); @@ -547,7 +591,9 @@ struct IntegerMoveable }; int IntegerMoveable::instanceCount = 0; +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(IntegerMoveable, Q_MOVABLE_TYPE); +QT_END_NAMESPACE template class Container> void containerInsertTest(QObject*) @@ -720,12 +766,12 @@ static void containerData() QTest::newRow("erase moveable") << static_cast(containerEraseTest); } -void tst_ExceptionSafetyObjects::vector_data() +void tst_ExceptionSafety_Objects::vector_data() { containerData(); } -void tst_ExceptionSafetyObjects::vector() +void tst_ExceptionSafety_Objects::vector() { QFETCH(TestFunction, testFunction); @@ -736,30 +782,30 @@ void tst_ExceptionSafetyObjects::vector() doOOMTest(testFunction, 0); } -void tst_ExceptionSafetyObjects::list_data() +void tst_ExceptionSafety_Objects::list_data() { containerData(); } -void tst_ExceptionSafetyObjects::list() +void tst_ExceptionSafety_Objects::list() { QFETCH(TestFunction, testFunction); doOOMTest(testFunction, 0); } -void tst_ExceptionSafetyObjects::linkedList_data() +void tst_ExceptionSafety_Objects::linkedList_data() { containerData(); } -void tst_ExceptionSafetyObjects::linkedList() +void tst_ExceptionSafety_Objects::linkedList() { QFETCH(TestFunction, testFunction); doOOMTest(testFunction, 0); } -QTEST_MAIN(tst_ExceptionSafetyObjects) +QTEST_MAIN(tst_ExceptionSafety_Objects) #include "tst_exceptionsafety_objects.moc" #endif // QT_NO_EXCEPTIONS diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/gestures/tst_gestures.cpp index 7327a49169..d580c8bb91 100644 --- a/tests/auto/gestures/tst_gestures.cpp +++ b/tests/auto/gestures/tst_gestures.cpp @@ -280,7 +280,7 @@ protected: eventsPtr->canceled << g->gestureType(); break; default: - Q_ASSERT(false); + qWarning() << "Unknown GestureState enum value:" << static_cast(g->state()); } } } else if (event->type() == CustomEvent::EventType) { @@ -823,7 +823,7 @@ public: emit gestureCanceled(e->type(), g); break; default: - Q_ASSERT(false); + qWarning() << "Unknown GestureState enum value:" << static_cast(g->state()); } } } else if (event->type() == CustomEvent::EventType) { @@ -1518,17 +1518,20 @@ void tst_Gestures::autoCancelGestures() { class MockWidget : public GestureWidget { public: - MockWidget(const char *name) : GestureWidget(name) { } + MockWidget(const char *name) : GestureWidget(name), badGestureEvents(0) { } bool event(QEvent *event) { if (event->type() == QEvent::Gesture) { QGestureEvent *ge = static_cast(event); - Q_ASSERT(ge->gestures().count() == 1); // can't use QCOMPARE here... + if (ge->gestures().count() != 1) + ++badGestureEvents; // event should contain exactly one gesture ge->gestures().first()->setGestureCancelPolicy(QGesture::CancelAllInContext); } return GestureWidget::event(event); } + + int badGestureEvents; }; const Qt::GestureType secondGesture = QGestureRecognizer::registerRecognizer(new CustomGestureRecognizer); @@ -1563,22 +1566,26 @@ void tst_Gestures::autoCancelGestures() event.serial = CustomGesture::SerialFinishedThreshold; QApplication::sendEvent(child, &event); QCOMPARE(parent.events.all.count(), 2); + QCOMPARE(parent.badGestureEvents, 0); } void tst_Gestures::autoCancelGestures2() { class MockItem : public GestureItem { public: - MockItem(const char *name) : GestureItem(name) { } + MockItem(const char *name) : GestureItem(name), badGestureEvents(0) { } bool event(QEvent *event) { if (event->type() == QEvent::Gesture) { QGestureEvent *ge = static_cast(event); - Q_ASSERT(ge->gestures().count() == 1); // can't use QCOMPARE here... + if (ge->gestures().count() != 1) + ++badGestureEvents; // event should contain exactly one gesture ge->gestures().first()->setGestureCancelPolicy(QGesture::CancelAllInContext); } return GestureItem::event(event); } + + int badGestureEvents; }; const Qt::GestureType secondGesture = QGestureRecognizer ::registerRecognizer(new CustomGestureRecognizer); @@ -1614,6 +1621,7 @@ void tst_Gestures::autoCancelGestures2() event.serial = CustomGesture::SerialFinishedThreshold; scene.sendEvent(child, &event); QCOMPARE(parent->events.all.count(), 2); + QCOMPARE(parent->badGestureEvents, 0); } void tst_Gestures::graphicsViewParentPropagation() diff --git a/tests/auto/lancelot/scripts/sizes.qps b/tests/auto/lancelot/scripts/sizes.qps index 268808ec09..68e01c3262 100644 --- a/tests/auto/lancelot/scripts/sizes.qps +++ b/tests/auto/lancelot/scripts/sizes.qps @@ -17,16 +17,6 @@ drawRect 120 0 16 16 drawRect 140 0 17 17 drawRect 160 0 18 18 drawRect 180 0 19 19 -# qt3_drawRect 200 0 10 10 -# qt3_drawRect 220 0 11 11 -# qt3_drawRect 240 0 12 12 -# qt3_drawRect 260 0 13 13 -# qt3_drawRect 280 0 14 14 -# qt3_drawRect 300 0 15 15 -# qt3_drawRect 320 0 16 16 -# qt3_drawRect 340 0 17 17 -# qt3_drawRect 360 0 18 18 -# qt3_drawRect 380 0 19 19 drawEllipse 0 20 10 10 drawEllipse 20 20 11 11 @@ -38,16 +28,6 @@ drawEllipse 120 20 16 16 drawEllipse 140 20 17 17 drawEllipse 160 20 18 18 drawEllipse 180 20 19 19 -# qt3_drawEllipse 200 20 10 10 -# qt3_drawEllipse 220 20 11 11 -# qt3_drawEllipse 240 20 12 12 -# qt3_drawEllipse 260 20 13 13 -# qt3_drawEllipse 280 20 14 14 -# qt3_drawEllipse 300 20 15 15 -# qt3_drawEllipse 320 20 16 16 -# qt3_drawEllipse 340 20 17 17 -# qt3_drawEllipse 360 20 18 18 -# qt3_drawEllipse 380 20 19 19 drawRoundRect 0 40 10 10 drawRoundRect 20 40 11 11 @@ -59,16 +39,6 @@ drawRoundRect 120 40 16 16 drawRoundRect 140 40 17 17 drawRoundRect 160 40 18 18 drawRoundRect 180 40 19 19 -# qt3_drawRoundRect 200 40 10 10 -# qt3_drawRoundRect 220 40 11 11 -# qt3_drawRoundRect 240 40 12 12 -# qt3_drawRoundRect 260 40 13 13 -# qt3_drawRoundRect 280 40 14 14 -# qt3_drawRoundRect 300 40 15 15 -# qt3_drawRoundRect 320 40 16 16 -# qt3_drawRoundRect 340 40 17 17 -# qt3_drawRoundRect 360 40 18 18 -# qt3_drawRoundRect 380 40 19 19 drawPie 0 60 10 10 0 4320 drawPie 20 60 11 11 0 4320 @@ -80,16 +50,6 @@ drawPie 120 60 16 16 0 4320 drawPie 140 60 17 17 0 4320 drawPie 160 60 18 18 0 4320 drawPie 180 60 19 19 0 4320 -# qt3_drawPie 200 60 10 10 0 4320 -# qt3_drawPie 220 60 11 11 0 4320 -# qt3_drawPie 240 60 12 12 0 4320 -# qt3_drawPie 260 60 13 13 0 4320 -# qt3_drawPie 280 60 14 14 0 4320 -# qt3_drawPie 300 60 15 15 0 4320 -# qt3_drawPie 320 60 16 16 0 4320 -# qt3_drawPie 340 60 17 17 0 4320 -# qt3_drawPie 360 60 18 18 0 4320 -# qt3_drawPie 380 60 19 19 0 4320 drawArc 0 80 10 10 0 4320 drawArc 20 80 11 11 0 4320 @@ -101,16 +61,6 @@ drawArc 120 80 16 16 0 4320 drawArc 140 80 17 17 0 4320 drawArc 160 80 18 18 0 4320 drawArc 180 80 19 19 0 4320 -# qt3_drawArc 200 80 10 10 0 4320 -# qt3_drawArc 220 80 11 11 0 4320 -# qt3_drawArc 240 80 12 12 0 4320 -# qt3_drawArc 260 80 13 13 0 4320 -# qt3_drawArc 280 80 14 14 0 4320 -# qt3_drawArc 300 80 15 15 0 4320 -# qt3_drawArc 320 80 16 16 0 4320 -# qt3_drawArc 340 80 17 17 0 4320 -# qt3_drawArc 360 80 18 18 0 4320 -# qt3_drawArc 380 80 19 19 0 4320 drawChord 0 100 10 10 0 4320 drawChord 20 100 11 11 0 4320 @@ -122,16 +72,6 @@ drawChord 120 100 16 16 0 4320 drawChord 140 100 17 17 0 4320 drawChord 160 100 18 18 0 4320 drawChord 180 100 19 19 0 4320 -# qt3_drawChord 200 100 10 10 0 4320 -# qt3_drawChord 220 100 11 11 0 4320 -# qt3_drawChord 240 100 12 12 0 4320 -# qt3_drawChord 260 100 13 13 0 4320 -# qt3_drawChord 280 100 14 14 0 4320 -# qt3_drawChord 300 100 15 15 0 4320 -# qt3_drawChord 320 100 16 16 0 4320 -# qt3_drawChord 340 100 17 17 0 4320 -# qt3_drawChord 360 100 18 18 0 4320 -# qt3_drawChord 380 100 19 19 0 4320 end_block diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp index 9fbfd5a2c6..7069fdf3eb 100644 --- a/tests/auto/maketestselftest/tst_maketestselftest.cpp +++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp @@ -348,7 +348,6 @@ QStringList tst_MakeTestSelfTest::find_subdirs(QString const& pro_file, FindSubd << "QT_CONFIG+=phonon" << "QT_CONFIG+=private_tests" << "QT_CONFIG+=pulseaudio" - << "QT_CONFIG+=qt3support" << "QT_CONFIG+=script" << "QT_CONFIG+=svg" << "QT_CONFIG+=webkit" diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/moc/no-keywords.h index 1ebc4062c2..bec39a1512 100644 --- a/tests/auto/moc/no-keywords.h +++ b/tests/auto/moc/no-keywords.h @@ -52,9 +52,6 @@ #include #include //#include -#if defined(QT3_SUPPORT) -#include -#endif #if defined(WITH_DBUS) #include #endif diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/modeltest/dynamictreemodel.cpp index fa634b6a5f..80708d440e 100644 --- a/tests/auto/modeltest/dynamictreemodel.cpp +++ b/tests/auto/modeltest/dynamictreemodel.cpp @@ -44,6 +44,7 @@ #include #include #include +#include DynamicTreeModel::DynamicTreeModel(QObject *parent) @@ -66,9 +67,11 @@ QModelIndex DynamicTreeModel::index(int row, int column, const QModelIndex &pare const qint64 grandParent = findParentId(parent.internalId()); if (grandParent >= 0) { QList > parentTable = m_childItems.value(grandParent); - Q_ASSERT(parent.column() < parentTable.size()); + if (parent.column() >= parentTable.size()) + qFatal("%s: parent.column() must be less than parentTable.size()", Q_FUNC_INFO); QList parentSiblings = parentTable.at(parent.column()); - Q_ASSERT(parent.row() < parentSiblings.size()); + if (parent.row() >= parentSiblings.size()) + qFatal("%s: parent.row() must be less than parentSiblings.size()", Q_FUNC_INFO); } if (childIdColumns.size() == 0) @@ -189,7 +192,8 @@ QModelIndex ModelChangeCommand::findIndex(QList rows) while (i.hasNext()) { parent = m_model->index(i.next(), col, parent); - Q_ASSERT(parent.isValid()); + if (!parent.isValid()) + qFatal("%s: parent must be valid", Q_FUNC_INFO); } return parent; } diff --git a/tests/auto/modeltest/modeltest.cpp b/tests/auto/modeltest/modeltest.cpp index 98d707c8da..f60f86d09c 100644 --- a/tests/auto/modeltest/modeltest.cpp +++ b/tests/auto/modeltest/modeltest.cpp @@ -45,8 +45,6 @@ #include "modeltest.h" #include -#undef Q_ASSERT -#define Q_ASSERT QVERIFY Q_DECLARE_METATYPE ( QModelIndex ) @@ -55,7 +53,8 @@ Q_DECLARE_METATYPE ( QModelIndex ) */ ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false ) { - Q_ASSERT ( model ); + if (!model) + qFatal("%s: model must not be null", Q_FUNC_INFO); connect ( model, SIGNAL ( columnsAboutToBeInserted ( const QModelIndex &, int, int ) ), this, SLOT ( runAllTests() ) ); @@ -118,15 +117,15 @@ void ModelTest::runAllTests() */ void ModelTest::nonDestructiveBasicTest() { - Q_ASSERT ( model->buddy ( QModelIndex() ) == QModelIndex() ); + QVERIFY( model->buddy ( QModelIndex() ) == QModelIndex() ); model->canFetchMore ( QModelIndex() ); - Q_ASSERT ( model->columnCount ( QModelIndex() ) >= 0 ); - Q_ASSERT ( model->data ( QModelIndex() ) == QVariant() ); + QVERIFY( model->columnCount ( QModelIndex() ) >= 0 ); + QVERIFY( model->data ( QModelIndex() ) == QVariant() ); fetchingMore = true; model->fetchMore ( QModelIndex() ); fetchingMore = false; Qt::ItemFlags flags = model->flags ( QModelIndex() ); - Q_ASSERT ( flags == Qt::ItemIsDropEnabled || flags == 0 ); + QVERIFY( flags == Qt::ItemIsDropEnabled || flags == 0 ); model->hasChildren ( QModelIndex() ); model->hasIndex ( 0, 0 ); model->headerData ( 0, Qt::Horizontal ); @@ -135,8 +134,8 @@ void ModelTest::nonDestructiveBasicTest() QVariant cache; model->match ( QModelIndex(), -1, cache ); model->mimeTypes(); - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); - Q_ASSERT ( model->rowCount() >= 0 ); + QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() ); + QVERIFY( model->rowCount() >= 0 ); QVariant variant; model->setData ( QModelIndex(), variant, -1 ); model->setHeaderData ( -1, Qt::Horizontal, QVariant() ); @@ -158,17 +157,17 @@ void ModelTest::rowCount() // check top row QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); int rows = model->rowCount ( topIndex ); - Q_ASSERT ( rows >= 0 ); + QVERIFY( rows >= 0 ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( topIndex ) == true ); + QVERIFY( model->hasChildren ( topIndex ) ); QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex ); if ( secondLevelIndex.isValid() ) { // not the top level // check a row count where parent is valid rows = model->rowCount ( secondLevelIndex ); - Q_ASSERT ( rows >= 0 ); + QVERIFY( rows >= 0 ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( secondLevelIndex ) == true ); + QVERIFY( model->hasChildren ( secondLevelIndex ) ); } // The models rowCount() is tested more extensively in checkChildren(), @@ -182,12 +181,12 @@ void ModelTest::columnCount() { // check top row QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->columnCount ( topIndex ) >= 0 ); + QVERIFY( model->columnCount ( topIndex ) >= 0 ); // check a column count where parent is valid QModelIndex childIndex = model->index ( 0, 0, topIndex ); if ( childIndex.isValid() ) - Q_ASSERT ( model->columnCount ( childIndex ) >= 0 ); + QVERIFY( model->columnCount ( childIndex ) >= 0 ); // columnCount() is tested more extensively in checkChildren(), // but this catches the big mistakes @@ -200,19 +199,19 @@ void ModelTest::hasIndex() { // qDebug() << "hi"; // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->hasIndex ( -2, -2 ) == false ); - Q_ASSERT ( model->hasIndex ( -2, 0 ) == false ); - Q_ASSERT ( model->hasIndex ( 0, -2 ) == false ); + QVERIFY( !model->hasIndex ( -2, -2 ) ); + QVERIFY( !model->hasIndex ( -2, 0 ) ); + QVERIFY( !model->hasIndex ( 0, -2 ) ); int rows = model->rowCount(); int columns = model->columnCount(); // check out of bounds - Q_ASSERT ( model->hasIndex ( rows, columns ) == false ); - Q_ASSERT ( model->hasIndex ( rows + 1, columns + 1 ) == false ); + QVERIFY( !model->hasIndex ( rows, columns ) ); + QVERIFY( !model->hasIndex ( rows + 1, columns + 1 ) ); if ( rows > 0 ) - Q_ASSERT ( model->hasIndex ( 0, 0 ) == true ); + QVERIFY( model->hasIndex ( 0, 0 ) ); // hasIndex() is tested more extensively in checkChildren(), // but this catches the big mistakes @@ -225,9 +224,9 @@ void ModelTest::index() { // qDebug() << "i"; // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->index ( -2, -2 ) == QModelIndex() ); - Q_ASSERT ( model->index ( -2, 0 ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, -2 ) == QModelIndex() ); + QVERIFY( model->index ( -2, -2 ) == QModelIndex() ); + QVERIFY( model->index ( -2, 0 ) == QModelIndex() ); + QVERIFY( model->index ( 0, -2 ) == QModelIndex() ); int rows = model->rowCount(); int columns = model->columnCount(); @@ -236,13 +235,13 @@ void ModelTest::index() return; // Catch off by one errors - Q_ASSERT ( model->index ( rows, columns ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, 0 ).isValid() == true ); + QVERIFY( model->index ( rows, columns ) == QModelIndex() ); + QVERIFY( model->index ( 0, 0 ).isValid() ); // Make sure that the same index is *always* returned QModelIndex a = model->index ( 0, 0 ); QModelIndex b = model->index ( 0, 0 ); - Q_ASSERT ( a == b ); + QVERIFY( a == b ); // index() is tested more extensively in checkChildren(), // but this catches the big mistakes @@ -256,7 +255,7 @@ void ModelTest::parent() // qDebug() << "p"; // Make sure the model wont crash and will return an invalid QModelIndex // when asked for the parent of an invalid index. - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); + QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() ); if ( model->rowCount() == 0 ) return; @@ -269,13 +268,13 @@ void ModelTest::parent() // Common error test #1, make sure that a top level index has a parent // that is a invalid QModelIndex. QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->parent ( topIndex ) == QModelIndex() ); + QVERIFY( model->parent ( topIndex ) == QModelIndex() ); // Common error test #2, make sure that a second level index has a parent // that is the first level index. if ( model->rowCount ( topIndex ) > 0 ) { QModelIndex childIndex = model->index ( 0, 0, topIndex ); - Q_ASSERT ( model->parent ( childIndex ) == topIndex ); + QVERIFY( model->parent ( childIndex ) == topIndex ); } // Common error test #3, the second column should NOT have the same children @@ -285,7 +284,7 @@ void ModelTest::parent() if ( model->rowCount ( topIndex1 ) > 0 ) { QModelIndex childIndex = model->index ( 0, 0, topIndex ); QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 ); - Q_ASSERT ( childIndex != childIndex1 ); + QVERIFY( childIndex != childIndex1 ); } // Full test, walk n levels deep through the model making sure that all @@ -325,47 +324,47 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) int columns = model->columnCount ( parent ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) ); + QVERIFY( model->hasChildren ( parent ) ); // Some further testing against rows(), columns(), and hasChildren() - Q_ASSERT ( rows >= 0 ); - Q_ASSERT ( columns >= 0 ); + QVERIFY( rows >= 0 ); + QVERIFY( columns >= 0 ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) == true ); + QVERIFY( model->hasChildren ( parent ) ); //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows // << "columns:" << columns << "parent column:" << parent.column(); - Q_ASSERT ( model->hasIndex ( rows + 1, 0, parent ) == false ); + QVERIFY( !model->hasIndex ( rows + 1, 0, parent ) ); for ( int r = 0; r < rows; ++r ) { if ( model->canFetchMore ( parent ) ) { fetchingMore = true; model->fetchMore ( parent ); fetchingMore = false; } - Q_ASSERT ( model->hasIndex ( r, columns + 1, parent ) == false ); + QVERIFY( !model->hasIndex ( r, columns + 1, parent ) ); for ( int c = 0; c < columns; ++c ) { - Q_ASSERT ( model->hasIndex ( r, c, parent ) == true ); + QVERIFY( model->hasIndex ( r, c, parent ) ); QModelIndex index = model->index ( r, c, parent ); // rowCount() and columnCount() said that it existed... - Q_ASSERT ( index.isValid() == true ); + QVERIFY( index.isValid() ); // index() should always return the same index when called twice in a row QModelIndex modifiedIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == modifiedIndex ); + QVERIFY( index == modifiedIndex ); // Make sure we get the same index if we request it twice in a row QModelIndex a = model->index ( r, c, parent ); QModelIndex b = model->index ( r, c, parent ); - Q_ASSERT ( a == b ); + QVERIFY( a == b ); // Some basic checking on the index that is returned - Q_ASSERT ( index.model() == model ); - Q_ASSERT ( index.row() == r ); - Q_ASSERT ( index.column() == c ); + QVERIFY( index.model() == model ); + QCOMPARE( index.row(), r ); + QCOMPARE( index.column(), c ); // While you can technically return a QVariant usually this is a sign - // of an bug in data() Disable if this really is ok in your model. -// Q_ASSERT ( model->data ( index, Qt::DisplayRole ).isValid() == true ); + // of a bug in data(). Disable if this really is ok in your model. +// QVERIFY( model->data ( index, Qt::DisplayRole ).isValid() ); // If the next test fails here is some somewhat useful debug you play with. @@ -380,8 +379,7 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) } // Check that we can get back our real parent. -// qDebug() << model->parent ( index ) << parent ; - Q_ASSERT ( model->parent ( index ) == parent ); + QCOMPARE( model->parent ( index ), parent ); // recursively go down the children if ( model->hasChildren ( index ) && currentDepth < 10 ) { @@ -391,7 +389,7 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) // make sure that after testing the children that the index doesn't change. QModelIndex newerIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == newerIndex ); + QVERIFY( index == newerIndex ); } } } @@ -402,68 +400,68 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) void ModelTest::data() { // Invalid index should return an invalid qvariant - Q_ASSERT ( !model->data ( QModelIndex() ).isValid() ); + QVERIFY( !model->data ( QModelIndex() ).isValid() ); if ( model->rowCount() == 0 ) return; // A valid index should have a valid QVariant data - Q_ASSERT ( model->index ( 0, 0 ).isValid() ); + QVERIFY( model->index ( 0, 0 ).isValid() ); // shouldn't be able to set data on an invalid index - Q_ASSERT ( model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) == false ); + QVERIFY( !model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) ); // General Purpose roles that should return a QString QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); + QVERIFY( qVariantCanConvert ( variant ) ); } variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); + QVERIFY( qVariantCanConvert ( variant ) ); } variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); + QVERIFY( qVariantCanConvert ( variant ) ); } // General Purpose roles that should return a QSize variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); + QVERIFY( qVariantCanConvert ( variant ) ); } // General Purpose roles that should return a QFont QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole ); if ( fontVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( fontVariant ) ); + QVERIFY( qVariantCanConvert ( fontVariant ) ); } // Check that the alignment is one we know about QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); if ( textAlignmentVariant.isValid() ) { int alignment = textAlignmentVariant.toInt(); - Q_ASSERT ( alignment == ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); + QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); } // General Purpose roles that should return a QColor QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( colorVariant ) ); + QVERIFY( qVariantCanConvert ( colorVariant ) ); } colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( colorVariant ) ); + QVERIFY( qVariantCanConvert ( colorVariant ) ); } // Check that the "check state" is one we know about. QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole ); if ( checkStateVariant.isValid() ) { int state = checkStateVariant.toInt(); - Q_ASSERT ( state == Qt::Unchecked || - state == Qt::PartiallyChecked || - state == Qt::Checked ); + QVERIFY( state == Qt::Unchecked || + state == Qt::PartiallyChecked || + state == Qt::Checked ); } } @@ -472,7 +470,7 @@ void ModelTest::data() \sa rowsInserted() */ -void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int end ) +void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int /* end */) { // Q_UNUSED(end); // qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString() @@ -494,7 +492,7 @@ void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, in void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) { Changing c = insert.pop(); - Q_ASSERT ( c.parent == parent ); + QVERIFY( c.parent == parent ); // qDebug() << "rowsInserted" << "start=" << start << "end=" << end << "oldsize=" << c.oldSize // << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent ); @@ -504,8 +502,8 @@ void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) // } // qDebug(); - Q_ASSERT ( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); + QVERIFY( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) ); + QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); if (c.next != model->data(model->index(end + 1, 0, c.parent))) { qDebug() << start << end; @@ -514,7 +512,7 @@ void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent)); } - Q_ASSERT ( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) ); + QVERIFY( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) ); } void ModelTest::layoutAboutToBeChanged() @@ -527,7 +525,7 @@ void ModelTest::layoutChanged() { for ( int i = 0; i < changing.count(); ++i ) { QPersistentModelIndex p = changing[i]; - Q_ASSERT ( p == model->index ( p.row(), p.column(), p.parent() ) ); + QVERIFY( p == model->index ( p.row(), p.column(), p.parent() ) ); } changing.clear(); } @@ -557,10 +555,10 @@ void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end ) { qDebug() << "rr" << parent << start << end; Changing c = remove.pop(); - Q_ASSERT ( c.parent == parent ); - Q_ASSERT ( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); - Q_ASSERT ( c.next == model->data ( model->index ( start, 0, c.parent ) ) ); + QVERIFY( c.parent == parent ); + QVERIFY( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) ); + QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); + QVERIFY( c.next == model->data ( model->index ( start, 0, c.parent ) ) ); } diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/modeltest/tst_modeltest.cpp index a75fe5b3c0..aedaffe5fb 100644 --- a/tests/auto/modeltest/tst_modeltest.cpp +++ b/tests/auto/modeltest/tst_modeltest.cpp @@ -201,8 +201,10 @@ class ObservingObject : public QObject Q_OBJECT public: ObservingObject(AccessibleProxyModel *proxy, QObject *parent = 0) - : QObject(parent), - m_proxy(proxy) + : QObject(parent) + , m_proxy(proxy) + , storePersistentFailureCount(0) + , checkPersistentFailureCount(0) { connect(m_proxy, SIGNAL(layoutAboutToBeChanged()), SLOT(storePersistent())); connect(m_proxy, SIGNAL(layoutChanged()), SLOT(checkPersistent())); @@ -215,8 +217,14 @@ public slots: for (int row = 0; row < m_proxy->rowCount(parent); ++row) { QModelIndex proxyIndex = m_proxy->index(row, 0, parent); QModelIndex sourceIndex = m_proxy->mapToSource(proxyIndex); - Q_ASSERT(proxyIndex.isValid()); - Q_ASSERT(sourceIndex.isValid()); + if (!proxyIndex.isValid()) { + qWarning("%s: Invalid proxy index", Q_FUNC_INFO); + ++storePersistentFailureCount; + } + if (!sourceIndex.isValid()) { + qWarning("%s: invalid source index", Q_FUNC_INFO); + ++storePersistentFailureCount; + } m_persistentSourceIndexes.append(sourceIndex); m_persistentProxyIndexes.append(proxyIndex); if (m_proxy->hasChildren(proxyIndex)) @@ -226,12 +234,24 @@ public slots: void storePersistent() { - foreach(const QModelIndex &idx, m_persistentProxyIndexes) - Q_ASSERT(idx.isValid()); // This is called from layoutAboutToBeChanged. Persistent indexes should be valid + // This method is called from layoutAboutToBeChanged. Persistent indexes should be valid + foreach(const QModelIndex &idx, m_persistentProxyIndexes) + if (!idx.isValid()) { + qWarning("%s: persistentProxyIndexes contains invalid index", Q_FUNC_INFO); + ++storePersistentFailureCount; + } - Q_ASSERT(m_proxy->persistent().isEmpty()); + if (!m_proxy->persistent().isEmpty()) { + qWarning("%s: proxy should have no persistent indexes when storePersistent called", + Q_FUNC_INFO); + ++storePersistentFailureCount; + } storePersistent(QModelIndex()); - Q_ASSERT(!m_proxy->persistent().isEmpty()); + if (m_proxy->persistent().isEmpty()) { + qWarning("%s: proxy should have persistent index after storePersistent called", + Q_FUNC_INFO); + ++storePersistentFailureCount; + } } void checkPersistent() @@ -243,7 +263,10 @@ public slots: for (int row = 0; row < m_persistentProxyIndexes.size(); ++row) { QModelIndex updatedProxy = m_persistentProxyIndexes.at(row); QModelIndex updatedSource = m_persistentSourceIndexes.at(row); - QCOMPARE(m_proxy->mapToSource(updatedProxy), updatedSource); + if (m_proxy->mapToSource(updatedProxy) != updatedSource) { + qWarning("%s: check failed at row %d", Q_FUNC_INFO, row); + ++checkPersistentFailureCount; + } } m_persistentSourceIndexes.clear(); m_persistentProxyIndexes.clear(); @@ -253,6 +276,9 @@ private: AccessibleProxyModel *m_proxy; QList m_persistentSourceIndexes; QList m_persistentProxyIndexes; +public: + int storePersistentFailureCount; + int checkPersistentFailureCount; }; void tst_ModelTest::moveSourceItems() @@ -280,6 +306,9 @@ void tst_ModelTest::moveSourceItems() moveCommand->setDestAncestors(QList() << 1); moveCommand->setDestRow(0); moveCommand->doCommand(); + + QCOMPARE(observer.storePersistentFailureCount, 0); + QCOMPARE(observer.checkPersistentFailureCount, 0); } void tst_ModelTest::testResetThroughProxy() @@ -302,6 +331,9 @@ void tst_ModelTest::testResetThroughProxy() ModelResetCommand *resetCommand = new ModelResetCommand(model, this); resetCommand->setNumCols(0); resetCommand->doCommand(); + + QCOMPARE(observer.storePersistentFailureCount, 0); + QCOMPARE(observer.checkPersistentFailureCount, 0); } diff --git a/tests/auto/other.pro b/tests/auto/other.pro index a84ab05104..b50e1697b3 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -3,14 +3,12 @@ TEMPLATE=subdirs SUBDIRS=\ -# exceptionsafety_objects \ shouldn't enable it # baselineexample \ Just an example demonstrating qbaselinetest usage lancelot \ - qaccessibility \ qalgorithms \ qcombobox \ qcssparser \ - #qdatastream \ # FIXME: uses qtsvg (QTBUG-19244) + qdatastream \ qdir \ qfocusevent \ qimage \ @@ -37,6 +35,8 @@ SUBDIRS=\ windowsmobile \ nativeimagehandleprovider +contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility + contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter mac: { SUBDIRS += macgui \ @@ -56,6 +56,8 @@ symbian { qs60mainapplication } +!win32-msvc*:!wince*:SUBDIRS += exceptionsafety_objects + # Following tests depends on private API !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qcombobox \ diff --git a/tests/auto/platformsocketengine/platformsocketengine.pro b/tests/auto/platformsocketengine/platformsocketengine.pro index faf745c679..99ae358a93 100644 --- a/tests/auto/platformsocketengine/platformsocketengine.pro +++ b/tests/auto/platformsocketengine/platformsocketengine.pro @@ -7,7 +7,7 @@ requires(contains(QT_CONFIG,private_tests)) MOC_DIR=tmp -QT = core network +QT = core-private network-private symbian { TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp index 1178169ab1..e77b7bb95e 100644 --- a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp +++ b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp @@ -83,8 +83,12 @@ public: bool open(QIODevice::OpenMode openMode) { - Q_ASSERT(!openForRead_); - Q_ASSERT(!openForWrite_); + if (openForRead_ || openForWrite_) { + qWarning("%s: file is already open for %s", + Q_FUNC_INFO, + (openForRead_ ? "reading" : "writing")); + return false; + } openFile_ = resolveFile(openMode & QIODevice::WriteOnly); if (!openFile_) @@ -132,13 +136,19 @@ public: qint64 pos() const { - Q_ASSERT(openForRead_ || openForWrite_); + if (!openForRead_ && !openForWrite_) { + qWarning("%s: file is not open", Q_FUNC_INFO); + return -1; + } return position_; } bool seek(qint64 pos) { - Q_ASSERT(openForRead_ || openForWrite_); + if (!openForRead_ && !openForWrite_) { + qWarning("%s: file is not open", Q_FUNC_INFO); + return false; + } if (pos >= 0) { position_ = pos; @@ -150,7 +160,11 @@ public: bool flush() { - Q_ASSERT(openForRead_ || openForWrite_); + if (!openForRead_ && !openForWrite_) { + qWarning("%s: file is not open", Q_FUNC_INFO); + return false; + } + return true; } @@ -346,10 +360,10 @@ public: void setFileName(const QString &file) { - Q_ASSERT(!openForRead_); - Q_ASSERT(!openForWrite_); - - fileName_ = file; + if (openForRead_ || openForWrite_) + qWarning("%s: Can't set file name while file is open", Q_FUNC_INFO); + else + fileName_ = file; } // typedef QAbstractFileEngineIterator Iterator; @@ -368,9 +382,16 @@ public: qint64 read(char *data, qint64 maxLen) { - Q_ASSERT(openForRead_); + if (!openForRead_) { + qWarning("%s: file must be open for reading", Q_FUNC_INFO); + return -1; + } + + if (openFile_.isNull()) { + qWarning("%s: file must not be null", Q_FUNC_INFO); + return -1; + } - Q_ASSERT(!openFile_.isNull()); QMutexLocker lock(&openFile_->mutex); qint64 readSize = qMin(openFile_->content.size() - position_, maxLen); if (readSize < 0) @@ -384,12 +405,19 @@ public: qint64 write(const char *data, qint64 length) { - Q_ASSERT(openForWrite_); + if (!openForWrite_) { + qWarning("%s: file must be open for writing", Q_FUNC_INFO); + return -1; + } + + if (openFile_.isNull()) { + qWarning("%s: file must not be null", Q_FUNC_INFO); + return -1; + } if (length < 0) return -1; - Q_ASSERT(!openFile_.isNull()); QMutexLocker lock(&openFile_->mutex); if (openFile_->content.size() == position_) openFile_->content.append(data, length); @@ -434,7 +462,8 @@ protected: QSharedPointer resolveFile(bool create) const { if (openForRead_ || openForWrite_) { - Q_ASSERT(openFile_); + if (!openFile_) + qWarning("%s: file should not be null", Q_FUNC_INFO); return openFile_; } diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp index f15244525d..3c202920d6 100644 --- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -299,7 +299,7 @@ public: startTimer(2000); } - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent * /* event */) { // should not crash. (void)new QScrollArea(this); diff --git a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp index 11730f277c..8dfa37fc39 100644 --- a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp +++ b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp @@ -90,7 +90,7 @@ public: QSizeF documentSize() const { return QSizeF(); } QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); } QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } - void documentChanged(int from, int oldLength, int length) { + void documentChanged(int from, int /* oldLength */, int length) { ++changeEvents; QTextBlock last = document()->lastBlock(); diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro index 21e286baea..75fd1e9793 100644 --- a/tests/auto/qaccessibility/qaccessibility.pro +++ b/tests/auto/qaccessibility/qaccessibility.pro @@ -1,4 +1,5 @@ load(qttest_p4) +requires(contains(QT_CONFIG,accessibility)) SOURCES += tst_qaccessibility.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index 7ff1a0867c..9110bd717d 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -40,9 +40,6 @@ ****************************************************************************/ -#ifdef QT3_SUPPORT -#include -#endif #include #ifndef Q_OS_WINCE #include "../../shared/util.h" @@ -228,17 +225,10 @@ private slots: void customWidget(); void deletedWidget(); - void childCount(); - void childAt(); // also indexOfChild - void relationTo(); void navigateGeometric(); void navigateHierarchy(); void navigateSlider(); void navigateCovered(); - void navigateControllers(); - void navigateLabels(); - void text(); - void setText(); void hideShowTest(); void userActionCount(); @@ -248,7 +238,6 @@ private slots: void applicationTest(); void mainWindowTest(); void buttonTest(); - void sliderTest(); void scrollBarTest(); void tabTest(); void tabWidgetTest(); @@ -271,15 +260,11 @@ private slots: void tableViewTest(); void calendarWidgetTest(); void dockWidgetTest(); - void pushButtonTest(); void comboBoxTest(); void accessibleName(); void treeWidgetTest(); void labelTest(); void accelerators(); - -private: - QWidget *createGUI(); }; const double Q_PI = 3.14159265358979323846; @@ -326,69 +311,16 @@ QString eventName(const int ev) } } -static QString stateNames(int state) -{ - QString stateString; - if (state == 0x00000000) stateString += " Normal"; - if (state & 0x00000001) stateString += " Unavailable"; - if (state & 0x00000002) stateString += " Selected"; - if (state & 0x00000004) stateString += " Focused"; - if (state & 0x00000008) stateString += " Pressed"; - if (state & 0x00000010) stateString += " Checked"; - if (state & 0x00000020) stateString += " Mixed"; - if (state & 0x00000040) stateString += " ReadOnly"; - if (state & 0x00000080) stateString += " HotTracked"; - if (state & 0x00000100) stateString += " DefaultButton"; - if (state & 0x00000200) stateString += " Expanded"; - if (state & 0x00000400) stateString += " Collapsed"; - if (state & 0x00000800) stateString += " Busy"; - if (state & 0x00001000) stateString += " Floating"; - if (state & 0x00002000) stateString += " Marqueed"; - if (state & 0x00004000) stateString += " Animated"; - if (state & 0x00008000) stateString += " Invisible"; - if (state & 0x00010000) stateString += " Offscreen"; - if (state & 0x00020000) stateString += " Sizeable"; - if (state & 0x00040000) stateString += " Moveable"; - if (state & 0x00080000) stateString += " SelfVoicing"; - if (state & 0x00100000) stateString += " Focusable"; - if (state & 0x00200000) stateString += " Selectable"; - if (state & 0x00400000) stateString += " Linked"; - if (state & 0x00800000) stateString += " Traversed"; - if (state & 0x01000000) stateString += " MultiSelectable"; - if (state & 0x02000000) stateString += " ExtSelectable"; - if (state & 0x04000000) stateString += " AlertLow"; - if (state & 0x08000000) stateString += " AlertMedium"; - if (state & 0x10000000) stateString += " AlertHigh"; - if (state & 0x20000000) stateString += " Protected"; - if (state & 0x3fffffff) stateString += " Valid"; - - if (stateString.isEmpty()) - stateString = "Unknown state " + QString::number(state); - - return stateString; -} - QAccessible::State state(QWidget * const widget) { QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget); - Q_ASSERT(iface); - QAccessible::State state = iface->state(0); + if (!iface) + qWarning() << "Cannot get QAccessibleInterface for widget"; + QAccessible::State state = (iface ? iface->state(0) : static_cast(0)); delete iface; return state; } -void printState(QWidget * const widget) -{ - qDebug() << "State for" << widget->metaObject()->className() << stateNames(state(widget)); -} - -void printState(QAccessibleInterface * const iface, const int child = 0) -{ - qDebug() << "State for" << iface->object()->metaObject()->className() << "child" << child - << iface->text(QAccessible::Name, child) << stateNames(iface->state(child)); -} - - class QtTestAccessibleWidget: public QWidget { Q_OBJECT @@ -403,7 +335,6 @@ public: } }; -#ifdef QTEST_ACCESSIBILITY class QtTestAccessibleWidgetIface: public QAccessibleWidget { public: @@ -421,7 +352,6 @@ public: return 0; } }; -#endif tst_QAccessibility::tst_QAccessibility() { @@ -433,17 +363,13 @@ tst_QAccessibility::~tst_QAccessibility() void tst_QAccessibility::initTestCase() { -#ifdef QTEST_ACCESSIBILITY QTestAccessibility::initialize(); QAccessible::installFactory(QtTestAccessibleWidgetIface::ifaceFactory); -#endif } void tst_QAccessibility::cleanupTestCase() { -#ifdef QTEST_ACCESSIBILITY QTestAccessibility::cleanup(); -#endif } void tst_QAccessibility::init() @@ -453,7 +379,6 @@ void tst_QAccessibility::init() void tst_QAccessibility::cleanup() { -#ifdef QTEST_ACCESSIBILITY const EventList list = QTestAccessibility::events(); if (!list.isEmpty()) { qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(), @@ -463,14 +388,10 @@ void tst_QAccessibility::cleanup() eventName(list.at(i).event).toAscii().constData(), list.at(i).event, list.at(i).child); } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::eventTest() { -#ifdef QTEST_ACCESSIBILITY QPushButton* button = new QPushButton(0); button->setObjectName(QString("Olaf")); @@ -491,14 +412,10 @@ void tst_QAccessibility::eventTest() QVERIFY_EVENT(button, 0, QAccessible::ObjectHide); delete button; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::customWidget() { -#ifdef QTEST_ACCESSIBILITY QtTestAccessibleWidget* widget = new QtTestAccessibleWidget(0, "Heinz"); QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget); @@ -510,14 +427,10 @@ void tst_QAccessibility::customWidget() delete iface; delete widget; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::deletedWidget() { -#ifdef QTEST_ACCESSIBILITY QtTestAccessibleWidget *widget = new QtTestAccessibleWidget(0, "Ralf"); QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget); QVERIFY(iface != 0); @@ -528,403 +441,10 @@ void tst_QAccessibility::deletedWidget() widget = 0; QVERIFY(!iface->isValid()); delete iface; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -} - -QWidget *tst_QAccessibility::createGUI() -{ -#if !defined(QT3_SUPPORT) - qWarning( "Should never get here without Qt3Support"); - return 0; -#else -# ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = new QWidget(0, Qt::X11BypassWindowManagerHint); - QGridLayout *grid = new QGridLayout(toplevel, 2, 2); - - // topLeft - hierarchies - Q3VBox *topLeft = new Q3VBox(toplevel, "topLeft"); - topLeft->setSpacing(2); - grid->addWidget(topLeft, 0, 0); - - Q3VButtonGroup *group1 = new Q3VButtonGroup("Title1:", topLeft, "group1"); - /*QPushButton *pb1 = */ new QPushButton("Button&1", group1, "pb1"); - Q3VButtonGroup *group2 = new Q3VButtonGroup("Title2:", topLeft, "group2"); - /*QPushButton *pb2 = */ new QPushButton("Button2", group2, "pb2"); - - Q3WidgetStack *stack = new Q3WidgetStack(topLeft, "stack"); - QLabel *page1 = new QLabel("Page 1", stack, "page1"); - stack->addWidget(page1); - QLabel *page2 = new QLabel("Page 2", stack, "page2"); - stack->addWidget(page2); - QLabel *page3 = new QLabel("Page 3", stack, "page3"); - stack->addWidget(page3); - - // topRight - controlling - Q3VBox *topRight= new Q3VBox(toplevel, "topRight"); - grid->addWidget(topRight, 0, 1); - - QPushButton *pbOk = new QPushButton("Ok", topRight, "pbOk" ); - pbOk->setDefault(TRUE); - QSlider *slider = new QSlider(Qt::Horizontal, topRight, "slider"); - QLCDNumber *sliderLcd = new QLCDNumber(topRight, "sliderLcd"); - QSpinBox *spinBox = new QSpinBox(topRight, "spinBox"); - - connect(pbOk, SIGNAL(clicked()), toplevel, SLOT(close()) ); - connect(slider, SIGNAL(valueChanged(int)), sliderLcd, SLOT(display(int))); - connect(spinBox, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int))); - - spinBox->setValue(50); - - // bottomLeft - labeling and controlling - Q3HBox *bottomLeft = new Q3HBox(toplevel, "bottomLeft"); - grid->addWidget(bottomLeft, 1, 0); - - QLabel *label = new QLabel("This is a &lineedit:", bottomLeft, "label"); - QLineEdit *lineedit = new QLineEdit(bottomLeft, "lineedit"); - label->setBuddy(lineedit); - QLabel *label2 = new QLabel(bottomLeft, "label2"); - - connect(lineedit, SIGNAL(textChanged(const QString&)), label2, SLOT(setText(const QString&))); - - Q3VButtonGroup *radiogroup = new Q3VButtonGroup("Exclusive &choices:", bottomLeft, "radiogroup"); - QLineEdit *frequency = new QLineEdit(radiogroup, "frequency"); - frequency->setText("100 Mhz"); - QRadioButton *radioAM = new QRadioButton("&AM", radiogroup, "radioAM"); - /* QRadioButton *radioFM = */ new QRadioButton("&FM", radiogroup, "radioFM"); - /* QRadioButton *radioSW = */ new QRadioButton("&Shortwave", radiogroup, "radioSW"); - - // bottomRight - ### empty - Q3HBox *bottomRight = new Q3HBox(toplevel, "bottomRight"); - grid->addWidget(bottomRight, 1, 1); - - toplevel->adjustSize(); // sends layout and child events - - // some tooltips - QToolTip::add(label, "A label"); - QToolTip::add(lineedit, "A line edit"); - // some whatsthis - QWhatsThis::add(label, "A label displays static text"); - QWhatsThis::add(frequency, "You can enter a single line of text here"); - - radioAM->setFocus(); - QTestAccessibility::clearEvents(); - return toplevel; -# else - Q_ASSERT(0); // this function cannot be called without accessibility support - return 0; -# endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::childAt() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel); - QVERIFY(acc_toplevel); - // this is necessary to have the layout setup correctly - toplevel->show(); - - QObjectList children = toplevel->queryList("QWidget", 0, 0, 0); - for (int c = 1; c <= children.count(); ++c) { - QWidget *child = qobject_cast(children.at(c-1)); - QAccessibleInterface *acc_child = QAccessible::queryAccessibleInterface(child); - QVERIFY(acc_child); - QCOMPARE(acc_child->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, QAccessible::Child); - - QPoint center(child->mapToGlobal(child->rect().center())); - QRect childRect(child->geometry()); - childRect.moveCenter(center); - - QCOMPARE(acc_child->rect(0), childRect); - QCOMPARE(acc_toplevel->childAt(childRect.center().x(), childRect.center().y()), c); - QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.top()), c); - QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.bottom()), c); - QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.top()), c); - QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.bottom()), c); - - QCOMPARE(acc_toplevel->indexOfChild(acc_child), c); - delete acc_child; - } - - delete acc_toplevel; - delete toplevel; - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::childCount() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - QObject *topLeft = toplevel->child("topLeft"); - QObject *topRight = toplevel->child("topRight"); - QObject *bottomLeft = toplevel->child("bottomLeft"); - QObject *bottomRight = toplevel->child("bottomRight"); - - QAccessibleInterface* acc_toplevel = QAccessible::queryAccessibleInterface(toplevel); - QAccessibleInterface* acc_topLeft = QAccessible::queryAccessibleInterface(topLeft); - QAccessibleInterface* acc_topRight = QAccessible::queryAccessibleInterface(topRight); - QAccessibleInterface* acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft); - QAccessibleInterface* acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight); - - QVERIFY(acc_toplevel); - QVERIFY(acc_topLeft); - QVERIFY(acc_topRight); - QVERIFY(acc_bottomLeft); - QVERIFY(acc_bottomRight); - - toplevel->show(); - QCOMPARE(acc_toplevel->childCount(), toplevel->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_topLeft->childCount(), topLeft->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_topRight->childCount(), topRight->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_bottomLeft->childCount(), bottomLeft->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_bottomRight->childCount(), bottomRight->queryList("QWidget", 0, 0, 0).count()); - - delete acc_toplevel; - delete acc_topLeft; - delete acc_topRight; - delete acc_bottomLeft; - delete acc_bottomRight; - delete toplevel; - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::relationTo() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - toplevel->resize(400,300); - QObject *topLeft = toplevel->child("topLeft"); - QObject *topRight = toplevel->child("topRight"); - QObject *bottomLeft = toplevel->child("bottomLeft"); - QObject *bottomRight = toplevel->child("bottomRight"); - - toplevel->show(); - - QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel); - - QAccessibleInterface *acc_topLeft = QAccessible::queryAccessibleInterface(topLeft); - QAccessibleInterface *acc_group1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")); - QVERIFY(topLeft->child("group1")); - QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")->child("pb1")); - QAccessibleInterface *acc_group2 = QAccessible::queryAccessibleInterface(topLeft->child("group2")); - QAccessibleInterface *acc_pb2 = 0; - QAccessibleInterface *acc_stack = QAccessible::queryAccessibleInterface(topLeft->child("stack")); - QAccessibleInterface *acc_page1 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page1")); - QAccessibleInterface *acc_page2 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page2")); - QAccessibleInterface *acc_page3 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page3")); - QAccessibleInterface *acc_topRight = QAccessible::queryAccessibleInterface(topRight); - QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk")); - QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider")); - QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox")); - QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd")); - - QAccessibleInterface *acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft); - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label")); - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit")); - QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(bottomLeft->child("label2")); - QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")); - QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM")); - QAccessibleInterface *acc_radioFM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioFM")); - QAccessibleInterface *acc_radioSW = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioSW")); - QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency")); - - QAccessibleInterface *acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight); - - QVERIFY(acc_toplevel); - QVERIFY(acc_topLeft); - QVERIFY(acc_topRight); - QVERIFY(acc_bottomLeft); - QVERIFY(acc_bottomRight); - QVERIFY(acc_group1); - QVERIFY(acc_group2); - QVERIFY(acc_stack); - QVERIFY(acc_page1); - QVERIFY(acc_page2); - QVERIFY(acc_page3); - QVERIFY(acc_pbOk); - QVERIFY(acc_slider); - QVERIFY(acc_spinBox); - QVERIFY(acc_sliderLcd); - QVERIFY(acc_label); - QVERIFY(acc_lineedit); - QVERIFY(acc_radiogroup); - QVERIFY(acc_radioAM); - QVERIFY(acc_radioFM); - QVERIFY(acc_radioSW); - QVERIFY(acc_frequency); - - // hierachy relations - QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Self); - QCOMPARE(acc_toplevel->relationTo(1, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 1) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - - QCOMPARE(acc_toplevel->relationTo(0, acc_topLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - - QCOMPARE(acc_toplevel->relationTo(0, acc_group1, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_page1, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_group1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); - QCOMPARE(acc_stack->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); - QCOMPARE(acc_page1->relationTo(0, acc_stack, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_page1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); - - QCOMPARE(acc_topLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_topRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_bottomLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_bottomRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - - QCOMPARE(acc_topLeft->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); - - QCOMPARE(acc_pb1->relationTo(0, acc_pb2, 0), QAccessible::Unrelated); - - // geometrical relations - only valid for siblings - QCOMPARE(acc_topLeft->relationTo(0, acc_topRight, 0), QAccessible::Sibling | QAccessible::Left); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomLeft, 0), QAccessible::Sibling | QAccessible::Up); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomRight, 0), QAccessible::Sibling | QAccessible::Left | QAccessible::Up); - - QCOMPARE(acc_bottomRight->relationTo(0, acc_topLeft, 0), QAccessible::Sibling | QAccessible::Right | QAccessible::Down); - QCOMPARE(acc_bottomRight->relationTo(0, acc_topRight, 0), QAccessible::Sibling | QAccessible::Down); - QCOMPARE(acc_bottomRight->relationTo(0, acc_bottomLeft, 0), QAccessible::Sibling | QAccessible::Right); -#ifdef Q_WS_MAC - QEXPECT_FAIL("", "Task 155501", Continue); -#endif - QCOMPARE(acc_group1->relationTo(0, acc_group2, 0), QAccessible::Sibling | QAccessible::Up); -#ifdef Q_WS_MAC - QEXPECT_FAIL("", "Task 155501", Continue); -#endif - QCOMPARE(acc_group2->relationTo(0, acc_group1, 0), QAccessible::Sibling | QAccessible::Down); - - // Covers/Covered tested in navigateCovered - - // logical relations - focus - QCOMPARE(acc_radioAM->relationTo(0, acc_radioFM, 0) & QAccessible::FocusChild, - QAccessible::Unrelated); - QCOMPARE(acc_radioAM->relationTo(0, acc_radiogroup, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); - QCOMPARE(acc_radioAM->relationTo(0, acc_bottomLeft, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); - QCOMPARE(acc_radioAM->relationTo(0, acc_topLeft, 0) & QAccessible::FocusChild, - QAccessible::Unrelated); - QCOMPARE(acc_radioAM->relationTo(0, acc_toplevel, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); - - // logical relations - labels - QCOMPARE(acc_label->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Label); - QCOMPARE(acc_lineedit->relationTo(0, acc_label, 0) & QAccessible::LogicalMask, - QAccessible::Labelled); - QCOMPARE(acc_label->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); - QCOMPARE(acc_lineedit->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); - - QEXPECT_FAIL("", "Make me accessible", Continue); - QCOMPARE(acc_radiogroup->relationTo(0, acc_radioAM, 0) & QAccessible::LogicalMask, - QAccessible::Label | QAccessible::Controlled); - QEXPECT_FAIL("", "Make me accessible", Continue); - QCOMPARE(acc_radiogroup->relationTo(0, acc_radioFM, 0) & QAccessible::LogicalMask, - QAccessible::Label | QAccessible::Controlled); - QEXPECT_FAIL("", "Make me accessible", Continue); - QCOMPARE(acc_radiogroup->relationTo(0, acc_radioSW, 0) & QAccessible::LogicalMask, - QAccessible::Label | QAccessible::Controlled); - QCOMPARE(acc_radiogroup->relationTo(0, acc_frequency, 0) & QAccessible::LogicalMask, - QAccessible::Label); - QCOMPARE(acc_frequency->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask, - QAccessible::Labelled); - QCOMPARE(acc_radiogroup->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); - - // logical relations - controller - QCOMPARE(acc_pbOk->relationTo(0, acc_toplevel, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - QCOMPARE(acc_slider->relationTo(0, acc_sliderLcd, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - QCOMPARE(acc_spinBox->relationTo(0, acc_slider, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - QCOMPARE(acc_lineedit->relationTo(0, acc_label2, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - - delete acc_toplevel; - delete acc_topLeft; - delete acc_group1; - delete acc_pb1; - delete acc_group2; - delete acc_stack; - delete acc_page1; - delete acc_page2; - delete acc_page3; - delete acc_topRight; - delete acc_pbOk; - delete acc_slider; - delete acc_spinBox; - delete acc_sliderLcd; - delete acc_bottomLeft; - delete acc_label; - delete acc_lineedit; - delete acc_label2; - delete acc_radiogroup; - delete acc_radioAM; - delete acc_radioFM; - delete acc_radioSW; - delete acc_frequency; - delete acc_bottomRight; - - delete toplevel; - - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT } void tst_QAccessibility::navigateGeometric() { -#ifdef QTEST_ACCESSIBILITY { static const int skip = 20; //speed the test up significantly static const double step = Q_PI / 180; @@ -1020,14 +540,10 @@ void tst_QAccessibility::navigateGeometric() delete w; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::navigateSlider() { -#ifdef QTEST_ACCESSIBILITY { QSlider *slider = new QSlider(0); slider->setObjectName(QString("Slidy")); @@ -1054,14 +570,10 @@ void tst_QAccessibility::navigateSlider() delete slider; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::navigateCovered() { -#ifdef QTEST_ACCESSIBILITY { QWidget *w = new QWidget(0); w->setObjectName(QString("Harry")); @@ -1164,14 +676,10 @@ void tst_QAccessibility::navigateCovered() delete w; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::navigateHierarchy() { -#ifdef QTEST_ACCESSIBILITY { QWidget *w = new QWidget(0); w->setObjectName(QString("Hans")); @@ -1267,241 +775,11 @@ void tst_QAccessibility::navigateHierarchy() delete w; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } #define QSETCOMPARE(thetypename, elements, otherelements) \ QCOMPARE((QSet() << elements), (QSet() << otherelements)) -void tst_QAccessibility::navigateControllers() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - { - Q3VBox vbox; - QSlider slider(&vbox); - QSpinBox spinBox(&vbox); - QLCDNumber lcd1(&vbox); - QLCDNumber lcd2(&vbox); - QLabel label(&vbox); - vbox.show(); - - slider.setObjectName("slider"); - spinBox.setObjectName("spinBox"); - lcd1.setObjectName("lcd1"); - lcd2.setObjectName("lcd2"); - label.setObjectName("label"); - - QTestAccessibility::clearEvents(); - - connect(&slider, SIGNAL(valueChanged(int)), &lcd1, SLOT(display(int))); - connect(&slider, SIGNAL(valueChanged(int)), &lcd2, SLOT(display(int))); - connect(&spinBox, SIGNAL(valueChanged(int)), &lcd2, SLOT(display(int))); - connect(&spinBox, SIGNAL(valueChanged(int)), &lcd1, SLOT(display(int))); - connect(&spinBox, SIGNAL(valueChanged(const QString&)), &label, SLOT(setText(const QString&))); - - QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(&slider); - QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(&spinBox); - QAccessibleInterface *acc_lcd1 = QAccessible::queryAccessibleInterface(&lcd1); - QAccessibleInterface *acc_lcd2 = QAccessible::queryAccessibleInterface(&lcd2); - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(&label); - - QVERIFY(acc_slider->relationTo(0, acc_lcd1, 0) & QAccessible::Controller); - QVERIFY(acc_slider->relationTo(0, acc_lcd2, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_lcd1, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_lcd2, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_label, 0) & QAccessible::Controller); - - QAccessibleInterface *acc_target1, *acc_target2, *acc_target3; - // from controller - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 0, &acc_target1), -1); - QVERIFY(!acc_target1); - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 1, &acc_target1), 0); - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 2, &acc_target2), 0); - QSETCOMPARE(QObject*, acc_lcd1->object() << acc_lcd2->object(), - acc_target1->object() << acc_target2->object()); - delete acc_target1; - delete acc_target2; - - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 3, &acc_target1), -1); - QVERIFY(!acc_target1); - - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 0, &acc_target1), -1); - QVERIFY(!acc_target1); - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 1, &acc_target1), 0); - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 2, &acc_target2), 0); - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 3, &acc_target3), 0); - QSETCOMPARE(QObject*, acc_lcd1->object() << acc_lcd2->object() << acc_label->object(), - acc_target1->object() << acc_target2->object() << acc_target3->object()); - delete acc_target1; - delete acc_target2; - delete acc_target3; - - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 4, &acc_target1), -1); - QVERIFY(!acc_target1); - - // to controller - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 0, &acc_target1), -1); - QVERIFY(!acc_target1); - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 1, &acc_target1), 0); - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 2, &acc_target2), 0); - QSETCOMPARE(QObject*, acc_slider->object() << acc_spinBox->object(), - acc_target1->object() << acc_target2->object()); - delete acc_target1; - delete acc_target2; - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 3, &acc_target1), -1); - QVERIFY(!acc_target1); - - delete acc_label; - delete acc_lcd2; - delete acc_lcd1; - delete acc_spinBox; - delete acc_slider; - } - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::navigateLabels() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - { - Q3VBox vbox; - Q3HBox hbox(&vbox); - - QLabel label(&hbox); - label.setText("This is a lineedit:"); - QLineEdit lineedit(&hbox); - label.setBuddy(&lineedit); - - Q3VButtonGroup groupbox(&vbox); - groupbox.setTitle("Be my children!"); - QRadioButton radio(&groupbox); - QLabel label2(&groupbox); - label2.setText("Another lineedit:"); - QLineEdit lineedit2(&groupbox); - label2.setBuddy(&lineedit2); - Q3GroupBox groupbox2(&groupbox); - groupbox2.setTitle("Some grand-children"); - QLineEdit grandchild(&groupbox2); - - Q3GroupBox border(&vbox); - QLineEdit lineedit3(&border); - vbox.show(); - QTestAccessibility::clearEvents(); - - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(&label); - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(&lineedit); - QAccessibleInterface *acc_groupbox = QAccessible::queryAccessibleInterface(&groupbox); - QAccessibleInterface *acc_radio = QAccessible::queryAccessibleInterface(&radio); - QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(&label2); - QAccessibleInterface *acc_lineedit2 = QAccessible::queryAccessibleInterface(&lineedit2); - QAccessibleInterface *acc_groupbox2 = QAccessible::queryAccessibleInterface(&groupbox2); - QAccessibleInterface *acc_grandchild = QAccessible::queryAccessibleInterface(&grandchild); - QAccessibleInterface *acc_border = QAccessible::queryAccessibleInterface(&border); - QAccessibleInterface *acc_lineedit3 = QAccessible::queryAccessibleInterface(&lineedit3); - - QVERIFY(acc_label->relationTo(0, acc_lineedit,0) & QAccessible::Label); - QVERIFY(acc_groupbox->relationTo(0, acc_radio,0) & QAccessible::Label); - QVERIFY(acc_groupbox->relationTo(0, acc_lineedit2,0) & QAccessible::Label); - QVERIFY(acc_groupbox->relationTo(0, acc_groupbox2,0) & QAccessible::Label); - QVERIFY(acc_groupbox2->relationTo(0, acc_grandchild,0) & QAccessible::Label); - QVERIFY(!(acc_border->relationTo(0, acc_lineedit3,0) & QAccessible::Label)); - - QAccessibleInterface *acc_target; - // from label - QCOMPARE(acc_label->navigate(QAccessible::Labelled, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_label->navigate(QAccessible::Labelled, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_lineedit->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_label->navigate(QAccessible::Labelled, 2, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_radio->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 2, &acc_target), 0); - QVERIFY(acc_target->object() == acc_label2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 3, &acc_target), 0); - QVERIFY(acc_target->object() == acc_lineedit2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 4, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 5, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_border->navigate(QAccessible::Labelled, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_border->navigate(QAccessible::Labelled, 1, &acc_target), -1); - QVERIFY(!acc_target); - - // to label - QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_label->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 2, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_radio->navigate(QAccessible::Label, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_radio->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_radio->navigate(QAccessible::Label, 2, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_label2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 2, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 3, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 2, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 3, &acc_target), -1); - QVERIFY(!acc_target); - - delete acc_label; - delete acc_lineedit; - delete acc_groupbox; - delete acc_radio; - delete acc_label2; - delete acc_lineedit2; - delete acc_groupbox2; - delete acc_grandchild; - delete acc_border; - delete acc_lineedit3; - } - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - static QWidget *createWidgets() { QWidget *w = new QWidget(); @@ -1550,7 +828,6 @@ static QWidget *createWidgets() void tst_QAccessibility::accessibleName() { -#ifdef QTEST_ACCESSIBILITY QWidget *toplevel = createWidgets(); toplevel->show(); #if defined(Q_WS_X11) @@ -1575,158 +852,10 @@ void tst_QAccessibility::accessibleName() delete toplevel; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -} - -void tst_QAccessibility::text() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - toplevel->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(toplevel); - QTest::qWait(100); -#endif - QObject *topLeft = toplevel->child("topLeft"); - QObject *topRight = toplevel->child("topRight"); - QObject *bottomLeft = toplevel->child("bottomLeft"); - - QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("pb1")); - - QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk")); - QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider")); - QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox")); - QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd")); - - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label")); - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit")); - QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")); - QVERIFY(bottomLeft->child("radiogroup")); - QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM")); - QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency")); - - QVERIFY(acc_pb1); - - QVERIFY(acc_pbOk); - QVERIFY(acc_slider); - QVERIFY(acc_spinBox); - QVERIFY(acc_sliderLcd); - - QVERIFY(acc_label); - QVERIFY(acc_lineedit); - QVERIFY(acc_radiogroup); - QVERIFY(acc_radioAM); - QVERIFY(acc_frequency); - - QVERIFY(acc_label->relationTo(0, acc_lineedit, 0) & QAccessible::Label); - QVERIFY(acc_radiogroup->relationTo(0, acc_frequency, 0) & QAccessible::Label); - QVERIFY(acc_slider->relationTo(0, acc_sliderLcd, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_slider, 0) & QAccessible::Controller); - - // Name - QCOMPARE(acc_lineedit->text(QAccessible::Name, 0), acc_label->text(QAccessible::Name,0)); - QCOMPARE(acc_frequency->text(QAccessible::Name, 0), acc_radiogroup->text(QAccessible::Name,0)); - QCOMPARE(acc_sliderLcd->text(QAccessible::Name, 0), acc_slider->text(QAccessible::Value,0)); - QCOMPARE(acc_pbOk->text(QAccessible::Name, 0), QString("Ok")); - QCOMPARE(acc_radioAM->text(QAccessible::Name, 0), QString("AM")); - QCOMPARE(acc_pb1->text(QAccessible::Name, 0), QString("Button1")); - - // Description - QString desc = qobject_cast(acc_label->object())->toolTip(); - QVERIFY(!desc.isEmpty()); - QCOMPARE(acc_label->text(QAccessible::Description, 0), desc); - desc = qobject_cast(acc_lineedit->object())->toolTip(); - QVERIFY(!desc.isEmpty()); - QCOMPARE(acc_lineedit->text(QAccessible::Description, 0), desc); - - // Help - QString help = qobject_cast(acc_label->object())->whatsThis(); - QVERIFY(!help.isEmpty()); - QCOMPARE(acc_label->text(QAccessible::Help, 0), help); - help = qobject_cast(acc_frequency->object())->whatsThis(); - QVERIFY(!help.isEmpty()); - QCOMPARE(acc_frequency->text(QAccessible::Help, 0), help); - - // Value - QString value = acc_frequency->object()->property("text").toString(); - QVERIFY(!value.isEmpty()); - QCOMPARE(acc_frequency->text(QAccessible::Value, 0), value); - value = acc_slider->object()->property("value").toString(); - QVERIFY(!value.isEmpty()); - QCOMPARE(acc_slider->text(QAccessible::Value, 0), value); - QCOMPARE(acc_spinBox->text(QAccessible::Value, 0), value); - - // Accelerator - QCOMPARE(acc_pbOk->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::Key_Enter)); - QCOMPARE(acc_pb1->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT + Qt::Key_1)); - QCOMPARE(acc_lineedit->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "L"); - QCOMPARE(acc_frequency->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "C"); - - delete acc_pb1; - delete acc_pbOk; - delete acc_slider; - delete acc_spinBox; - delete acc_sliderLcd; - - delete acc_label; - delete acc_lineedit; - delete acc_radiogroup; - delete acc_radioAM; - delete acc_frequency; - - delete toplevel; - QTestAccessibility::clearEvents(); - -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::setText() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - toplevel->show(); - QObject *bottomLeft = toplevel->findChild("bottomLeft"); - - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->findChild("lineedit")); - // Value, read-write - QString txt = acc_lineedit->text(QAccessible::Value, 0); - QVERIFY(txt.isEmpty()); - txt = QLatin1String("Writable"); - acc_lineedit->setText(QAccessible::Value, 0, txt); - QCOMPARE(acc_lineedit->text(QAccessible::Value, 0), txt); - - // Description, read-only - txt = acc_lineedit->text(QAccessible::Description, 0); - QVERIFY(!txt.isEmpty()); - acc_lineedit->setText(QAccessible::Description, 0, QLatin1String("")); - QCOMPARE(acc_lineedit->text(QAccessible::Description, 0), txt); - - QVERIFY(acc_lineedit); - - delete acc_lineedit; - delete toplevel; - QTestAccessibility::clearEvents(); - -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif //QT3_SUPPORT } void tst_QAccessibility::hideShowTest() { -#ifdef QTEST_ACCESSIBILITY QWidget * const window = new QWidget(); QWidget * const child = new QWidget(window); @@ -1753,14 +882,10 @@ void tst_QAccessibility::hideShowTest() delete window; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::userActionCount() { -#ifdef QTEST_ACCESSIBILITY QWidget widget; QAccessibleInterface *test = QAccessible::queryAccessibleInterface(&widget); @@ -1790,18 +915,14 @@ void tst_QAccessibility::userActionCount() QCOMPARE(test->userActionCount(1), 0); QCOMPARE(test->userActionCount(-1), 0); delete test; test = 0; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::actionText() { -#ifdef QTEST_ACCESSIBILITY - QWidget widget; - widget.show(); + QWidget *widget = new QWidget; + widget->show(); - QAccessibleInterface *test = QAccessible::queryAccessibleInterface(&widget); + QAccessibleInterface *test = QAccessible::queryAccessibleInterface(widget); QVERIFY(test); QVERIFY(test->isValid()); @@ -1813,20 +934,15 @@ void tst_QAccessibility::actionText() QCOMPARE(test->actionText(QAccessible::DefaultAction, QAccessible::Name, 0), QString("SetFocus")); QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QString("SetFocus")); - delete test; test = 0; + delete test; + delete widget; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif + QTestAccessibility::clearEvents(); } void tst_QAccessibility::doAction() { -#ifdef QTEST_ACCESSIBILITY QSKIP("TODO: Implement me", SkipAll); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::applicationTest() @@ -1881,7 +997,6 @@ public Q_SLOTS: void tst_QAccessibility::buttonTest() { -#ifdef QTEST_ACCESSIBILITY QWidget window; window.setLayout(new QVBoxLayout); @@ -1913,32 +1028,6 @@ void tst_QAccessibility::buttonTest() toggletool.setText("Toggle"); toggletool.setMinimumSize(20,20); -#if 0 - // QT3_SUPPORT - // push button with a menu - QPushButton menuButton("Menu", &window); - Q3PopupMenu buttonMenu(&menuButton); - buttonMenu.insertItem("Some item"); - menuButton.setPopup(&buttonMenu); - - // menu toolbutton - QToolButton menuToolButton(&window); - menuToolButton.setText("Menu Tool"); - Q3PopupMenu toolMenu(&menuToolButton); - toolMenu.insertItem("Some item"); - menuToolButton.setPopup(&toolMenu); - menuToolButton.setMinimumSize(20,20); - - // splitted menu toolbutton - QToolButton splitToolButton(&window); - splitToolButton.setTextLabel("Split Tool"); - Q3PopupMenu splitMenu(&splitToolButton); - splitMenu.insertItem("Some item"); - splitToolButton.setPopup(&splitMenu); - splitToolButton.setPopupDelay(0); - splitToolButton.setMinimumSize(20,20); -#endif - // test push button QAccessibleInterface* interface = QAccessible::queryAccessibleInterface(&pushButton); QAccessibleActionInterface* actionInterface = interface->actionInterface(); @@ -2070,215 +1159,10 @@ void tst_QAccessibility::buttonTest() // test->release(); QTestAccessibility::clearEvents(); - -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -} - -void tst_QAccessibility::sliderTest() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QAccessibleInterface *test = 0; - Q3VBox vbox; - QLabel labelHorizontal("Horizontal", &vbox); - QSlider sliderHorizontal(Qt::Horizontal, &vbox); - labelHorizontal.setBuddy(&sliderHorizontal); - - QLabel labelVertical("Vertical", &vbox); - QSlider sliderVertical(Qt::Vertical, &vbox); - labelVertical.setBuddy(&sliderVertical); - vbox.show(); - - // test horizontal slider - test = QAccessible::queryAccessibleInterface(&sliderHorizontal); - QVERIFY(test); - QCOMPARE(test->childCount(), 3); - QCOMPARE(test->role(0), QAccessible::Slider); - QCOMPARE(test->role(1), QAccessible::PushButton); - QCOMPARE(test->role(2), QAccessible::Indicator); - QCOMPARE(test->role(3), QAccessible::PushButton); - - QCOMPARE(test->text(QAccessible::Name, 0), labelHorizontal.text()); - QCOMPARE(test->text(QAccessible::Name, 1), QSlider::tr("Page left")); - QCOMPARE(test->text(QAccessible::Name, 2), QSlider::tr("Position")); - QCOMPARE(test->text(QAccessible::Name, 3), QSlider::tr("Page right")); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.value())); - QCOMPARE(test->text(QAccessible::Value, 1), QString()); - QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderHorizontal.value())); - QCOMPARE(test->text(QAccessible::Value, 3), QString()); -// Skip acton tests. -#if 0 - QCOMPARE(test->defaultAction(0), QAccessible::SetFocus); - QCOMPARE(test->defaultAction(1), QAccessible::Press); - QCOMPARE(test->defaultAction(2), QAccessible::NoAction); - QCOMPARE(test->defaultAction(3), QAccessible::Press); - QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QSlider::tr("Set Focus")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 1), QSlider::tr("Press")); - QCOMPARE(test->actionText(QAccessible::Increase, QAccessible::Name, 2), QSlider::tr("Increase")); - QCOMPARE(test->actionText(QAccessible::Decrease, QAccessible::Name, 2), QSlider::tr("Decrease")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 3), QSlider::tr("Press")); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderHorizontal.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.lineStep())); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderHorizontal.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); -#endif - delete test; - - // test vertical slider - test = QAccessible::queryAccessibleInterface(&sliderVertical); - QVERIFY(test); - QCOMPARE(test->childCount(), 3); - QCOMPARE(test->role(0), QAccessible::Slider); - QCOMPARE(test->role(1), QAccessible::PushButton); - QCOMPARE(test->role(2), QAccessible::Indicator); - QCOMPARE(test->role(3), QAccessible::PushButton); - - QCOMPARE(test->text(QAccessible::Name, 0), labelVertical.text()); - QCOMPARE(test->text(QAccessible::Name, 1), QSlider::tr("Page up")); - QCOMPARE(test->text(QAccessible::Name, 2), QSlider::tr("Position")); - QCOMPARE(test->text(QAccessible::Name, 3), QSlider::tr("Page down")); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.value())); - QCOMPARE(test->text(QAccessible::Value, 1), QString()); - QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderVertical.value())); - QCOMPARE(test->text(QAccessible::Value, 3), QString()); -// Skip acton tests. -#if 0 - QCOMPARE(test->defaultAction(0), QAccessible::SetFocus); - QCOMPARE(test->defaultAction(1), QAccessible::Press); - QCOMPARE(test->defaultAction(2), QAccessible::NoAction); - QCOMPARE(test->defaultAction(3), QAccessible::Press); - QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QSlider::tr("Set Focus")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 1), QSlider::tr("Press")); - QCOMPARE(test->actionText(QAccessible::Increase, QAccessible::Name, 2), QSlider::tr("Increase")); - QCOMPARE(test->actionText(QAccessible::Decrease, QAccessible::Name, 2), QSlider::tr("Decrease")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 3), QSlider::tr("Press")); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderVertical.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.lineStep())); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderVertical.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); -#endif - delete test; - - // Test that when we hide() a slider, the PageLeft, Indicator, and PageRight also gets the - // Invisible state bit set. - enum SubControls { PageLeft = 1, Position = 2, PageRight = 3 }; - - QSlider *slider = new QSlider(); - QAccessibleInterface * const sliderInterface = QAccessible::queryAccessibleInterface(slider); - QVERIFY(sliderInterface); - - QVERIFY(sliderInterface->state(0) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(Position) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageRight) & QAccessible::Invisible); - - slider->show(); - QVERIFY(sliderInterface->state(0) ^ QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Invisible); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Invisible); - QVERIFY(QTestAccessibility::events().contains(QTestAccessibilityEvent(slider, 0, QAccessible::ObjectShow))); - QTestAccessibility::clearEvents(); - - slider->hide(); - QVERIFY(sliderInterface->state(0) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(Position) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageRight) & QAccessible::Invisible); - QVERIFY(QTestAccessibility::events().contains(QTestAccessibilityEvent(slider, 0, QAccessible::ObjectHide))); - QTestAccessibility::clearEvents(); - - // Test that the left/right subcontrols are set to unavailable when the slider is at the minimum/maximum. - slider->show(); - slider->setMinimum(0); - slider->setMaximum(100); - - slider->setValue(50); - QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Unavailable); - - slider->setValue(0); - QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Unavailable); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Unavailable); - - slider->setValue(100); - QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(PageRight) & QAccessible::Unavailable); - - delete sliderInterface; - delete slider; - - // Test that the rects are ok. - { - QSlider *slider = new QSlider(Qt::Horizontal); - slider->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(slider); - QTest::qWait(100); -#endif - QAccessibleInterface * const sliderInterface = QAccessible::queryAccessibleInterface(slider); - QVERIFY(sliderInterface); - - slider->setMinimum(0); - slider->setMaximum(100); - slider->setValue(50); - - const QRect sliderRect = sliderInterface->rect(0); - QVERIFY(sliderRect.isValid()); - - // Verify that the sub-control rects are valid and inside the slider rect. - for (int i = PageLeft; i <= PageRight; ++i) { - const QRect testRect = sliderInterface->rect(i); - QVERIFY(testRect.isValid()); - QVERIFY(sliderRect.contains(testRect)); - } - - delete slider; - delete sliderInterface; - } - - - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif //!QT3_SUPPORT } void tst_QAccessibility::scrollBarTest() { -#ifdef QTEST_ACCESSIBILITY // Test that when we hide() a slider, the PageLeft, Indicator, and PageRight also gets the // Invisible state bit set. enum SubControls { LineUp = 1, @@ -2286,7 +1170,7 @@ void tst_QAccessibility::scrollBarTest() Position = 3, PageDown = 4, LineDown = 5 - }; + }; QScrollBar *scrollBar = new QScrollBar(); QAccessibleInterface * const scrollBarInterface = QAccessible::queryAccessibleInterface(scrollBar); @@ -2368,15 +1252,10 @@ void tst_QAccessibility::scrollBarTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif - } void tst_QAccessibility::tabTest() { -#ifdef QTEST_ACCESSIBILITY QTabBar *tabBar = new QTabBar(); tabBar->show(); @@ -2412,9 +1291,6 @@ void tst_QAccessibility::tabTest() delete tabBar; delete interface; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::tabWidgetTest() @@ -2512,7 +1388,6 @@ void tst_QAccessibility::tabWidgetTest() void tst_QAccessibility::menuTest() { -#ifdef QTEST_ACCESSIBILITY { QMainWindow mw; mw.resize(300, 200); @@ -2758,14 +1633,10 @@ void tst_QAccessibility::menuTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); -#endif } void tst_QAccessibility::spinBoxTest() { -#ifdef QTEST_ACCESSIBILITY QSpinBox * const spinBox = new QSpinBox(); spinBox->show(); @@ -2792,14 +1663,10 @@ void tst_QAccessibility::spinBoxTest() QVERIFY(events.contains(expectedEvent)); delete spinBox; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::doubleSpinBoxTest() { -#ifdef QTEST_ACCESSIBILITY QDoubleSpinBox *doubleSpinBox = new QDoubleSpinBox; doubleSpinBox->show(); @@ -2819,14 +1686,10 @@ void tst_QAccessibility::doubleSpinBoxTest() delete doubleSpinBox; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::textEditTest() { -#ifdef QTEST_ACCESSIBILITY { QTextEdit edit; QString text = "hello world\nhow are you today?\n"; @@ -2846,14 +1709,10 @@ void tst_QAccessibility::textEditTest() QCOMPARE(iface->textInterface()->characterRect(6, QAccessible2::RelativeToParent).size(), QSize(fm.width("w"), fm.height())); } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::textBrowserTest() { -#ifdef QTEST_ACCESSIBILITY { QTextBrowser textBrowser; QString text = QLatin1String("Hello world\nhow are you today?\n"); @@ -2870,14 +1729,10 @@ void tst_QAccessibility::textBrowserTest() QCOMPARE(interface->text(QAccessible::Value, 6), QString()); } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::listViewTest() { -#if 1 //def QTEST_ACCESSIBILITY { QListView listView; QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&listView); @@ -2943,15 +1798,11 @@ void tst_QAccessibility::listViewTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::mdiAreaTest() { -#ifdef QTEST_ACCESSIBILITY { QMdiArea mdiArea; mdiArea.resize(400,300); @@ -3000,14 +1851,10 @@ void tst_QAccessibility::mdiAreaTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::mdiSubWindowTest() { -#ifdef QTEST_ACCESSIBILITY { QMdiArea mdiArea; mdiArea.show(); @@ -3130,14 +1977,10 @@ void tst_QAccessibility::mdiSubWindowTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::lineEditTest() { -#ifdef QTEST_ACCESSIBILITY QLineEdit *le = new QLineEdit; QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(le); QVERIFY(iface); @@ -3195,14 +2038,10 @@ void tst_QAccessibility::lineEditTest() delete le2; delete toplevel; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::workspaceTest() { -#ifdef QTEST_ACCESSIBILITY { QWorkspace workspace; workspace.resize(400,300); @@ -3256,14 +2095,10 @@ void tst_QAccessibility::workspaceTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::dialogButtonBoxTest() { -#ifdef QTEST_ACCESSIBILITY { QDialogButtonBox box(QDialogButtonBox::Reset | QDialogButtonBox::Help | @@ -3376,14 +2211,10 @@ void tst_QAccessibility::dialogButtonBoxTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::dialTest() { -#ifdef QTEST_ACCESSIBILITY { QDial dial; dial.setValue(20); @@ -3425,28 +2256,20 @@ void tst_QAccessibility::dialTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::rubberBandTest() { -#ifdef QTEST_ACCESSIBILITY QRubberBand rubberBand(QRubberBand::Rectangle); QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&rubberBand); QVERIFY(interface); QCOMPARE(interface->role(0), QAccessible::Border); delete interface; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::abstractScrollAreaTest() { -#ifdef QTEST_ACCESSIBILITY { QAbstractScrollArea abstractScrollArea; @@ -3604,14 +2427,10 @@ void tst_QAccessibility::abstractScrollAreaTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::scrollAreaTest() { -#ifdef QTEST_ACCESSIBILITY { QScrollArea scrollArea; scrollArea.show(); @@ -3625,14 +2444,10 @@ void tst_QAccessibility::scrollAreaTest() delete interface; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::tableWidgetTest() { -#ifdef QTEST_ACCESSIBILITY { QWidget *topLevel = new QWidget; QTableWidget *w = new QTableWidget(8,4,topLevel); @@ -3672,10 +2487,6 @@ void tst_QAccessibility::tableWidgetTest() delete topLevel; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif - } class QtTestTableModel: public QAbstractTableModel @@ -3758,7 +2569,6 @@ public: void tst_QAccessibility::tableViewTest() { -#ifdef QTEST_ACCESSIBILITY { QtTestTableModel *model = new QtTestTableModel(3, 4); QTableView *w = new QTableView(); @@ -3838,15 +2648,11 @@ void tst_QAccessibility::tableViewTest() delete model; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::calendarWidgetTest() { #ifndef QT_NO_CALENDARWIDGET -#ifdef QTEST_ACCESSIBILITY { QCalendarWidget calendarWidget; @@ -3939,17 +2745,12 @@ void tst_QAccessibility::calendarWidgetTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif #endif // QT_NO_CALENDARWIDGET } void tst_QAccessibility::dockWidgetTest() { #ifndef QT_NO_DOCKWIDGET - -#ifdef QTEST_ACCESSIBILITY // Set up a proper main window with two dock widgets QMainWindow *mw = new QMainWindow(); QFrame *central = new QFrame(mw); @@ -4017,61 +2818,11 @@ void tst_QAccessibility::dockWidgetTest() delete dock2; delete mw; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif #endif // QT_NO_DOCKWIDGET } -void tst_QAccessibility::pushButtonTest() -{ -#if !defined(QT3_SUPPORT) - qWarning( "Should never get here without Qt3Support"); - return ; -#else -#ifdef QTEST_ACCESSIBILITY - // Set up a proper main window with two dock widgets - QWidget *toplevel = createGUI(); - QObject *topRight = toplevel->findChild("topRight"); - - toplevel->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(toplevel); - QTest::qWait(100); -#endif - QPushButton *pb = qobject_cast(topRight->findChild("pbOk")); - QPoint pt = pb->mapToGlobal(pb->geometry().topLeft()); - QRect rect(pt, pb->geometry().size()); - pt = rect.center(); - - QAccessibleInterface *accToplevel = QAccessible::queryAccessibleInterface(toplevel); - QAccessibleInterface *acc; - QAccessibleInterface *acc2; - int entry = accToplevel->childAt(pt.x(), pt.y()); - accToplevel->navigate(QAccessible::Child, entry, &acc); - if (acc) { - entry = acc->childAt(pt.x(), pt.y()); - acc->navigate(QAccessible::Child, entry, &acc2); - delete acc; - acc = acc2; - } - QCOMPARE(acc->role(0), QAccessible::PushButton); - QCOMPARE(acc->rect(0), rect); - QCOMPARE(acc->childAt(pt.x(), pt.y()), 0); - - delete acc; - delete accToplevel; - delete toplevel; - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif //QT3_SUPPORT -} - void tst_QAccessibility::comboBoxTest() { -#ifdef QTEST_ACCESSIBILITY #if defined(Q_OS_WINCE) if (!IsValidCEPlatform()) { QSKIP("Test skipped on Windows Mobile test hardware", SkipAll); @@ -4109,15 +2860,10 @@ void tst_QAccessibility::comboBoxTest() delete w; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif - } void tst_QAccessibility::treeWidgetTest() { -#ifdef QTEST_ACCESSIBILITY QWidget *w = new QWidget; QTreeWidget *tree = new QTreeWidget(w); QHBoxLayout *l = new QHBoxLayout(w); @@ -4175,14 +2921,10 @@ void tst_QAccessibility::treeWidgetTest() delete w; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::labelTest() { -#ifdef QTEST_ACCESSIBILITY QString text = "Hello World"; QLabel *label = new QLabel(text); label->show(); @@ -4221,14 +2963,10 @@ void tst_QAccessibility::labelTest() delete acc_label; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::accelerators() { -#ifdef QTEST_ACCESSIBILITY QWidget *window = new QWidget; QHBoxLayout *lay = new QHBoxLayout(window); QLabel *label = new QLabel(tr("&Line edit"), window); @@ -4252,6 +2990,10 @@ void tst_QAccessibility::accelerators() QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + QLatin1String("A")); label->setText(tr("Q &&A")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); + +#if !defined(QT_NO_DEBUG) && !defined(Q_WS_MAC) + QTest::ignoreMessage(QtWarningMsg, "QKeySequence::mnemonic: \"Q &A&B\" contains multiple occurrences of '&'"); +#endif label->setText(tr("Q &A&B")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + QLatin1String("A")); @@ -4261,9 +3003,6 @@ void tst_QAccessibility::accelerators() QTest::qWait(100); delete window; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); -#endif } diff --git a/tests/auto/qalgorithms/q3tl.h b/tests/auto/qalgorithms/q3tl.h deleted file mode 100644 index c856cbf533..0000000000 --- a/tests/auto/qalgorithms/q3tl.h +++ /dev/null @@ -1,212 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt3Support module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef Q3TL_H -#define Q3TL_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Qt3SupportLight) - -template -Q_OUTOFLINE_TEMPLATE void qHeapSortPushDown(T *heap, int first, int last, LessThan lessThan) -{ - int r = first; - while (r <= last / 2) { - if (last == 2 * r) { - // node r has only one child - if (lessThan(heap[2 * r], heap[r])) - qSwap(heap[r], heap[2 * r]); - r = last; - } else { - // node r has two children - if (lessThan(heap[2 * r], heap[r]) && !lessThan(heap[2 * r + 1], heap[2 * r])) { - // swap with left child - qSwap(heap[r], heap[2 * r]); - r *= 2; - } else if (lessThan(heap[2 * r + 1], heap[r]) - && lessThan(heap[2 * r + 1], heap[2 * r])) { - // swap with right child - qSwap(heap[r], heap[2 * r + 1]); - r = 2 * r + 1; - } else { - r = last; - } - } - } -} - -template -Q_OUTOFLINE_TEMPLATE void qHeapSortHelper(BiIterator begin, BiIterator end, const T & /* dummy */, LessThan lessThan) -{ - BiIterator it = begin; - uint n = 0; - while (it != end) { - ++n; - ++it; - } - if (n == 0) - return; - - // Create the heap - BiIterator insert = begin; - T *realheap = new T[n]; - T *heap = realheap - 1; - int size = 0; - for(; insert != end; ++insert) { - heap[++size] = *insert; - int i = size; - while (i > 1 && lessThan(heap[i], heap[i / 2])) { - qSwap(heap[i], heap[i / 2]); - i /= 2; - } - } - - // Now do the sorting - for (int i = n; i > 0; i--) { - *begin++ = heap[1]; - if (i > 1) { - heap[1] = heap[i]; - qHeapSortPushDown(heap, 1, i - 1, lessThan); - } - } - - delete[] realheap; -} - -template -inline void qHeapSortHelper(BiIterator begin, BiIterator end, const T &dummy) -{ - qHeapSortHelper(begin, end, dummy, qLess()); -} - -template -inline void qHeapSort(BiIterator begin, BiIterator end, LessThan lessThan) -{ - if (begin != end) - qHeapSortHelper(begin, end, *begin, lessThan); -} - -template -inline void qHeapSort(BiIterator begin, BiIterator end) -{ - if (begin != end) - qHeapSortHelper(begin, end, *begin); -} - -template -inline void qHeapSort(Container &c) -{ -#ifdef Q_CC_BOR - // Work around Borland 5.5 optimizer bug - c.detach(); -#endif - if (!c.empty()) - qHeapSortHelper(c.begin(), c.end(), *c.begin()); -} - - -template -void qBubbleSort(BiIterator begin, BiIterator end, LessThan lessThan) -{ - // Goto last element; - BiIterator last = end; - - // empty list - if (begin == end) - return; - - --last; - // only one element ? - if (last == begin) - return; - - // So we have at least two elements in here - while (begin != last) { - bool swapped = false; - BiIterator swapPos = begin; - BiIterator x = end; - BiIterator y = x; - y--; - do { - --x; - --y; - if (lessThan(*x, *y)) { - swapped = true; - qSwap(*x, *y); - swapPos = y; - } - } while (y != begin); - if (!swapped) - return; - begin = swapPos; - ++begin; - } -} - -template -void qBubbleSortHelper(BiIterator begin, BiIterator end, T) -{ - qBubbleSort(begin, end, qLess()); -} - -template -void qBubbleSort(BiIterator begin, BiIterator end) -{ - if (begin != end) - qBubbleSortHelper(begin, end, *begin); -} - -template -inline void qBubbleSort(Container &c) -{ - qBubbleSort(c.begin(), c.end()); -} - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // Q3TL_H diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp index d0d8e9aead..75df1fea79 100644 --- a/tests/auto/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp @@ -47,7 +47,6 @@ #include #include #include -#include "q3tl.h" #include #include #include @@ -71,8 +70,6 @@ public slots: void cleanup(); private slots: - void qBubbleSort(); - void qHeapSort(); void test_qLowerBound_data(); void test_qLowerBound(); void test_qUpperBound_data(); @@ -100,13 +97,11 @@ private: }; tst_QAlgorithms::tst_QAlgorithms() - { } tst_QAlgorithms::~tst_QAlgorithms() { - } void tst_QAlgorithms::init() @@ -241,7 +236,8 @@ QList testAlgorithm(Algorithm &algorithm, QStringList dataSetTypes, foreach(QString dataSetType, dataSetTypes) { QVector container = generateData(dataSetType, size); results.append(testRun(container, algorithm, time)); - Q_ASSERT(isSorted(container)); + if (!isSorted(container)) + qWarning("%s: container is not sorted after test", Q_FUNC_INFO); } return results; } @@ -266,149 +262,6 @@ void testAlgorithm(Algorithm algorithm, QStringList &dataSetTypes) } } #endif -static bool userFunction1(char ch1, char ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -bool userFunction2(const char &ch1, char ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -static inline bool userFunction3(char ch1, const char &ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -inline bool userFunction4(const char &ch1, const char &ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -class UserFunctor1 -{ -public: - UserFunctor1(int x = 1) : y(x) {} - - bool operator()(char ch1, char ch2) - { - return (ch1 ^ y) < (ch2 ^ y); - } - - char y; -}; - -void tst_QAlgorithms::qHeapSort() -{ - char array1[] = "3141592"; - ::qHeapSort((char *)array1, array1 + strlen(array1)); - QVERIFY(strcmp(array1, "1123459") == 0); - - ::qHeapSort((char *)array1, array1 + strlen(array1), qGreater()); - QVERIFY(strcmp(array1, "9543211") == 0); - - ::qHeapSort((char *)array1, array1 + strlen(array1), qLess()); - QVERIFY(strcmp(array1, "1123459") == 0); - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction2); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction3); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction4); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - UserFunctor1 userFunctor1; - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunctor1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1()); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(1)); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(3)); - QVERIFY(strcmp(array2, "3210765498CBA@ED") == 0); - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(0)); - QVERIFY(strcmp(array2, "0123456789@ABCDE") == 0); - } -} - -void tst_QAlgorithms::qBubbleSort() -{ - char array1[] = "3141592"; - ::qBubbleSort((char *)array1, array1 + strlen(array1)); - QVERIFY(strcmp(array1, "1123459") == 0); - - ::qBubbleSort((char *)array1, array1 + strlen(array1), qGreater()); - QVERIFY(strcmp(array1, "9543211") == 0); - - ::qBubbleSort((char *)array1, array1 + strlen(array1), qLess()); - QVERIFY(strcmp(array1, "1123459") == 0); - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction2); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction3); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction4); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - UserFunctor1 userFunctor1; - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunctor1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1()); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(1)); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(3)); - QVERIFY(strcmp(array2, "3210765498CBA@ED") == 0); - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(0)); - QVERIFY(strcmp(array2, "0123456789@ABCDE") == 0); - } -} void tst_QAlgorithms::swap() { @@ -557,7 +410,7 @@ void tst_QAlgorithms::sortedList() QList list; list << 4 << 3 << 6; - ::qHeapSort(list.begin(), list.end()); + ::qSort(list.begin(), list.end()); QCOMPARE(list.count(), 3); QCOMPARE(list.at(0), 3); @@ -877,26 +730,6 @@ void tst_QAlgorithms::convenienceAPI() qDeleteAll(pointerList.begin(), pointerList.end()); } -template -class HeapSortHelper -{ -public: - void operator()(QVector list) - { - ::qHeapSort(list); - } -}; - -template -class BubbleSortHelper -{ -public: - void operator()(QVector list) - { - ::qBubbleSort(list); - } -}; - template class QuickSortHelper { @@ -948,22 +781,14 @@ void tst_QAlgorithms::performance() testAlgorithm, TestInt>(StlSortHelper(), dataSetTypes); cout << endl << "std::stable_sort" << endl; testAlgorithm, TestInt>(StlStableSortHelper(), dataSetTypes); - cout << "Heap sort" << endl; - testAlgorithm, TestInt>(HeapSortHelper(), dataSetTypes); - cout << endl << "Bubble sort" << endl; - testAlgorithm, TestInt>(BubbleSortHelper(), dataSetTypes); /* cout << endl << "Sorting lists of ints" << endl; - cout << "Heap sort" << endl; - testAlgorithm, int>(HeapSortHelper(), dataSetTypes); cout << endl << "Quick sort" << endl; testAlgorithm, int>(QuickSortHelper(), dataSetTypes); cout << endl << "std::sort" << endl; testAlgorithm, int>(StlSortHelper(), dataSetTypes); cout << endl << "std::stable_sort" << endl; testAlgorithm, int>(StlStableSortHelper(), dataSetTypes); - cout << endl << "Bubble sort" << endl; - testAlgorithm, int>(BubbleSortHelper(), dataSetTypes); */ } #endif diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/qapplication/modal/main.cpp index 2365991084..8ff6f330fd 100644 --- a/tests/auto/qapplication/modal/main.cpp +++ b/tests/auto/qapplication/modal/main.cpp @@ -49,5 +49,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QApplication::setAttribute(Qt::AA_NativeWindows); //QTBUG-15774 base *b = new base(); + Q_UNUSED(b); return app.exec(); } diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/qatomicint/tst_qatomicint.cpp index 717187a2a6..5ccb997290 100644 --- a/tests/auto/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/qatomicint/tst_qatomicint.cpp @@ -116,8 +116,7 @@ tst_QAtomicInt::~tst_QAtomicInt() void tst_QAtomicInt::warningFreeHelper() { - Q_ASSERT(false); - // The code below is bogus, and shouldn't be run. We're looking for warnings, only. + qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only."); QBasicAtomicInt i = Q_BASIC_ATOMIC_INITIALIZER(0); diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp index af8fabc962..05f8294148 100644 --- a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp @@ -98,8 +98,7 @@ struct WFHC void tst_QAtomicPointer::warningFreeHelper() { - Q_ASSERT(false); - // The code below is bogus, and shouldn't be run. We're looking for warnings, only. + qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only."); QBasicAtomicPointer p = Q_BASIC_ATOMIC_INITIALIZER(0); diff --git a/tests/auto/qauthenticator/qauthenticator.pro b/tests/auto/qauthenticator/qauthenticator.pro index 05f83bc166..8ddb13b0df 100644 --- a/tests/auto/qauthenticator/qauthenticator.pro +++ b/tests/auto/qauthenticator/qauthenticator.pro @@ -1,5 +1,5 @@ load(qttest_p4) requires(contains(QT_CONFIG,private_tests)) -QT = core network +QT = core network-private SOURCES += tst_qauthenticator.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/qbuffer/tst_qbuffer.cpp b/tests/auto/qbuffer/tst_qbuffer.cpp index 3e3cc739bf..5d6b84f827 100644 --- a/tests/auto/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/qbuffer/tst_qbuffer.cpp @@ -309,8 +309,7 @@ void tst_QBuffer::seekTest() // (see Task 184730) { char c; - const int offset = 1; - Q_ASSERT(offset > 0); // any positive integer will do + const int offset = 1; // any positive integer will do const qint64 pos = buf.size() + offset; QVERIFY(buf.seek(pos)); QCOMPARE(buf.pos(), pos); diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp index 45dd7ebed1..911a30cc77 100644 --- a/tests/auto/qchar/tst_qchar.cpp +++ b/tests/auto/qchar/tst_qchar.cpp @@ -548,14 +548,14 @@ void tst_QChar::normalization_data() QList l = line.split(';'); - Q_ASSERT(l.size() == 5); + QCOMPARE(l.size(), 5); QStringList columns; for (int i = 0; i < 5; ++i) { columns.append(QString()); QList c = l.at(i).split(' '); - Q_ASSERT(!c.isEmpty()); + QVERIFY(!c.isEmpty()); for (int j = 0; j < c.size(); ++j) { bool ok; diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/qcolor/tst_qcolor.cpp index d42c26cbd6..b02537ec57 100644 --- a/tests/auto/qcolor/tst_qcolor.cpp +++ b/tests/auto/qcolor/tst_qcolor.cpp @@ -1506,7 +1506,6 @@ void tst_QColor::setallowX11ColorNames() for (int i = 0; i < x11RgbTblSize; ++i) { QString colorName = QLatin1String(x11RgbTbl[i].name); QColor color; - QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1()); color.setNamedColor(colorName); QVERIFY(!color.isValid()); } @@ -1528,7 +1527,6 @@ void tst_QColor::setallowX11ColorNames() for (int i = 0; i < x11RgbTblSize; ++i) { QString colorName = QLatin1String(x11RgbTbl[i].name); QColor color; - QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1()); color.setNamedColor(colorName); QVERIFY(!color.isValid()); } diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro index 754f06fd49..e36df030c2 100644 --- a/tests/auto/qcolumnview/qcolumnview.pro +++ b/tests/auto/qcolumnview/qcolumnview.pro @@ -1,4 +1,5 @@ CONFIG += qttest_p4 +QT += gui-private core-private SOURCES += tst_qcolumnview.cpp TARGET = tst_qcolumnview diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro index 2ac5c7c53b..a8f0e6ad23 100644 --- a/tests/auto/qcombobox/qcombobox.pro +++ b/tests/auto/qcombobox/qcombobox.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += gui-private core-private SOURCES += tst_qcombobox.cpp diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index d525068893..33a630076e 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -1230,21 +1230,17 @@ void tst_QComboBox::insertItem_data() QTest::addColumn("insertIndex"); QTest::addColumn("itemLabel"); QTest::addColumn("expectedIndex"); - QTest::addColumn("testQt3Support"); QTest::addColumn("editable"); QStringList initialItems; initialItems << "foo" << "bar"; for(int e = 0 ; e<2 ; e++) { bool editable = (e==0); - QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << false << editable; - QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << false << editable; - QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << false << editable; - QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << false << editable; - QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << false << editable; -#if defined(QT3_SUPPORT) - QTest::newRow("Qt3Support: Insert less then 0") << initialItems << -1 << "inserted" << 2 << true << editable; -#endif + QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << editable; + QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << editable; + QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << editable; + QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << editable; + QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << editable; } } @@ -1254,7 +1250,6 @@ void tst_QComboBox::insertItem() QFETCH(int, insertIndex); QFETCH(QString, itemLabel); QFETCH(int, expectedIndex); - QFETCH(bool, testQt3Support); QFETCH(bool, editable); testWidget->insertItems(0, initialItems); @@ -1263,16 +1258,7 @@ void tst_QComboBox::insertItem() testWidget->setEditable(true); if (editable) testWidget->setEditText("FOO"); -#if defined (QT3_SUPPORT) - if (testQt3Support) - testWidget->insertItem(itemLabel, insertIndex); - else - testWidget->insertItem(insertIndex, itemLabel); -#else - Q_UNUSED(testQt3Support); testWidget->insertItem(insertIndex, itemLabel); -#endif - QCOMPARE(testWidget->count(), initialItems.count() + 1); QCOMPARE(testWidget->itemText(expectedIndex), itemLabel); diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index 932c19ea54..b0d40d0d22 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -277,7 +277,9 @@ retry: case 'L': row = completer->completionCount() - 1; break; case 'F': row = 0; break; default: - Q_ASSERT(false); + QFAIL(qPrintable(QString( + "Problem with 'step' value in test data: %1 (only P, N, L and F are allowed)." + ).arg(step[i]))); } completer->setCurrentRow(row); } @@ -1248,9 +1250,7 @@ public: void tst_QCompleter::task189564_omitNonSelectableItems() { const QString prefix("a"); - Q_ASSERT(!prefix.isEmpty()); const int n = 5; - Q_ASSERT(n > 0); QStringList strings; for (int i = 0; i < n; ++i) @@ -1278,10 +1278,11 @@ public: { setEditable(true); setInsertPolicy(NoInsert); - Q_ASSERT(completer()); - completer()->setCompletionMode(QCompleter::PopupCompletion); - completer()->setCompletionRole(Qt::DisplayRole); - connect(lineEdit(), SIGNAL(editingFinished()), SLOT(setCompletionPrefix())); + if (completer()) { + completer()->setCompletionMode(QCompleter::PopupCompletion); + completer()->setCompletionRole(Qt::DisplayRole); + connect(lineEdit(), SIGNAL(editingFinished()), SLOT(setCompletionPrefix())); + } } private slots: void setCompletionPrefix() { completer()->setCompletionPrefix(lineEdit()->text()); } @@ -1290,6 +1291,7 @@ private slots: void tst_QCompleter::task246056_setCompletionPrefix() { task246056_ComboBox *comboBox = new task246056_ComboBox; + QVERIFY(comboBox->completer()); comboBox->addItem(""); comboBox->addItem("a1"); comboBox->addItem("a2"); diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp index 91628e501f..a56883be99 100644 --- a/tests/auto/qcopchannel/testSend/main.cpp +++ b/tests/auto/qcopchannel/testSend/main.cpp @@ -49,7 +49,11 @@ int main(int argc, char** argv) #ifdef Q_WS_QWS QApplication app(argc, argv); QStringList args = app.arguments(); - Q_ASSERT(args.count() == 3 || args.count() == 4); + if (args.count() != 3 && args.count() != 4) { + fprintf(stdout,qPrintable(QString("Usage: %1 channel message [data]").arg(args.at(0)))); + fflush(stdout); + return 1; + } QString channelName = args.at(1); QString msg = args.at(2); QByteArray data; diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro index f696f195de..16fa265231 100644 --- a/tests/auto/qcssparser/qcssparser.pro +++ b/tests/auto/qcssparser/qcssparser.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qcssparser.cpp -QT += xml +QT += xml gui-private requires(contains(QT_CONFIG,private_tests)) !symbian: { diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp index 86cca2daae..ddee2dd713 100644 --- a/tests/auto/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/qcssparser/tst_qcssparser.cpp @@ -148,7 +148,7 @@ void tst_QCssParser::scanner_data() } -static char *tokenName(QCss::TokenType t) +static const char *tokenName(QCss::TokenType t) { switch (t) { case QCss::NONE: return "NONE"; diff --git a/tests/auto/qdatastream/gearflowers.svg b/tests/auto/qdatastream/gearflowers.svg deleted file mode 100644 index 038e202d28..0000000000 --- a/tests/auto/qdatastream/gearflowers.svg +++ /dev/null @@ -1,8342 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Gearflowers - January 8, 2004 - - - Alexandre Rostovtsev - - - Wallpaper design for the KDE SVG contest. Also, hummingbirds are cool. - - - - gear - flower - hummingbird - - - - - Alexandre Rostovtsev - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/qdatastream/qdatastream.pro b/tests/auto/qdatastream/qdatastream.pro index 39bd09ef86..5e503aea78 100644 --- a/tests/auto/qdatastream/qdatastream.pro +++ b/tests/auto/qdatastream/qdatastream.pro @@ -1,23 +1,14 @@ load(qttest_p4) SOURCES += tst_qdatastream.cpp -!symbian: { -cross_compile: DEFINES += SVGFILE=\\\"tests2.svg\\\" -else: DEFINES += SVGFILE=\\\"gearflowers.svg\\\" -} - -# for qpaintdevicemetrics.h -QT += svg - - wince*: { - addFiles.files = datastream.q42 tests2.svg + addFiles.files = datastream.q42 addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\"\\\" } else:symbian { - # SRCDIR and SVGFILE defined in code in symbian - addFiles.files = datastream.q42 tests2.svg + # SRCDIR defined in code in symbian + addFiles.files = datastream.q42 addFiles.path = . DEPLOYMENT += addFiles TARGET.EPOCHEAPSIZE = 1000000 10000000 diff --git a/tests/auto/qdatastream/tests2.svg b/tests/auto/qdatastream/tests2.svg deleted file mode 100644 index e7942c7e19..0000000000 --- a/tests/auto/qdatastream/tests2.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -U - - - - diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index 70d37e9749..d05b664b42 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -42,16 +42,11 @@ #include #include -#ifdef QT3_SUPPORT -#include -#endif -#include #if defined(Q_OS_SYMBIAN) # define STRINGIFY(x) #x # define TOSTRING(x) STRINGIFY(x) # define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/" -#define SVGFILE "tests2.svg" #endif Q_DECLARE_METATYPE(QBitArray) @@ -114,12 +109,6 @@ private slots: void stream_QImage_data(); void stream_QImage(); - void stream_QPalette_data(); - void stream_QPalette(); - - void stream_QColorGroup_data(); - void stream_QColorGroup(); - void stream_QPen_data(); void stream_QPen(); @@ -156,9 +145,6 @@ private slots: void stream_qint64_data(); void stream_qint64(); - void stream_QWMatrix_data(); - void stream_QWMatrix(); - void stream_QIcon_data(); void stream_QIcon(); @@ -211,10 +197,6 @@ private slots: void floatingPointPrecision(); -#ifdef QT3_SUPPORT - void task_224283(); -#endif - void compatibility_Qt3(); void compatibility_Qt2(); @@ -232,8 +214,6 @@ private: void writeQDateTime(QDataStream *s); void writeQFont(QDataStream *s); void writeQImage(QDataStream *s); - void writeQPalette(QDataStream *s); - void writeQColorGroup(QDataStream *s); void writeQPen(QDataStream *s); void writeQPixmap(QDataStream *s); void writeQPoint(QDataStream *s); @@ -246,7 +226,6 @@ private: void writeMap(QDataStream* dev); void writeHash(QDataStream* dev); void writeqint64(QDataStream *s); - void writeQWMatrix(QDataStream *s); void writeQIcon(QDataStream *s); void writeQEasingCurve(QDataStream *s); @@ -262,8 +241,6 @@ private: void readQDateTime(QDataStream *s); void readQFont(QDataStream *s); void readQImage(QDataStream *s); - void readQPalette(QDataStream *s); - void readQColorGroup(QDataStream *s); void readQPen(QDataStream *s); void readQPixmap(QDataStream *s); void readQPoint(QDataStream *s); @@ -276,12 +253,8 @@ private: void readMap(QDataStream *s); void readHash(QDataStream *s); void readqint64(QDataStream *s); - void readQWMatrix(QDataStream *s); void readQIcon(QDataStream *s); void readQEasingCurve(QDataStream *s); - -private: - QString svgFile; }; static int NColorRoles[] = { @@ -327,7 +300,6 @@ void tst_QDataStream::getSetCheck() tst_QDataStream::tst_QDataStream() { - svgFile = QLatin1String(SRCDIR SVGFILE); } tst_QDataStream::~tst_QDataStream() @@ -347,12 +319,12 @@ static int dataIndex(const QString &tag) { int pos = tag.lastIndexOf("_"); if (pos >= 0) { - int ret = 0; - QString count = tag.mid(pos + 1); - bool ok; - ret = count.toInt(&ok); - if (ok) - return ret; + int ret = 0; + QString count = tag.mid(pos + 1); + bool ok; + ret = count.toInt(&ok); + if (ok) + return ret; } return -1; } @@ -378,15 +350,15 @@ void tst_QDataStream::stream_data(int noOfElements) QTest::addColumn("byteOrder"); for (int d=0; devices[d] != 0; d++) { - QString device = devices[d]; - for (int b=0; b<2; b++) { - QString byte_order = b == 0 ? "BigEndian" : "LittleEndian"; + QString device = devices[d]; + for (int b=0; b<2; b++) { + QString byte_order = b == 0 ? "BigEndian" : "LittleEndian"; - QString tag = device + "_" + byte_order; - for (int e=0; e.?/"); + switch (index) { + case 0: return QString(); + case 1: return QString(""); + case 2: return QString("A"); + case 3: return QString("ABCDE FGHI"); + case 4: return QString("This is a long string"); + case 5: return QString("And again a string with a \nCRLF"); + case 6: return QString("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRESTUVWXYZ 1234567890 ~`!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/"); } return QString("foo"); } @@ -517,15 +488,15 @@ void tst_QDataStream::readQString(QDataStream *s) static QRegExp QRegExpData(int index) { - switch (index) - { - case 0: return QRegExp(); - case 1: return QRegExp(""); - case 2: return QRegExp("A", Qt::CaseInsensitive); - case 3: return QRegExp("ABCDE FGHI", Qt::CaseSensitive, QRegExp::Wildcard); - case 4: return QRegExp("This is a long string", Qt::CaseInsensitive, QRegExp::FixedString); - case 5: return QRegExp("And again a string with a \nCRLF", Qt::CaseInsensitive, QRegExp::RegExp); - case 6: { + switch (index) { + case 0: return QRegExp(); + case 1: return QRegExp(""); + case 2: return QRegExp("A", Qt::CaseInsensitive); + case 3: return QRegExp("ABCDE FGHI", Qt::CaseSensitive, QRegExp::Wildcard); + case 4: return QRegExp("This is a long string", Qt::CaseInsensitive, QRegExp::FixedString); + case 5: return QRegExp("And again a string with a \nCRLF", Qt::CaseInsensitive, QRegExp::RegExp); + case 6: + { QRegExp rx("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRESTUVWXYZ 1234567890 ~`!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/"); rx.setMinimal(true); return rx; @@ -586,22 +557,21 @@ static Map MapData(int index) { Map map; - switch (index) - { - case 0: - default: - break; - case 1: - map.insert(1, "a"); - map.insert(2, "bbb"); - map.insert(3, "cccccc"); - break; - case 2: - map.insert(1, "a"); - map.insert(2, "one"); - map.insertMulti(2, "two"); - map.insertMulti(2, "three"); - map.insert(3, "cccccc"); + switch (index) { + case 0: + default: + break; + case 1: + map.insert(1, "a"); + map.insert(2, "bbb"); + map.insert(3, "cccccc"); + break; + case 2: + map.insert(1, "a"); + map.insert(2, "one"); + map.insertMulti(2, "two"); + map.insertMulti(2, "three"); + map.insert(3, "cccccc"); } return map; } @@ -643,22 +613,21 @@ static Hash HashData(int index) { Hash map; - switch (index) - { - case 0: - default: - break; - case 1: - map.insert(1, "a"); - map.insert(2, "bbb"); - map.insert(3, "cccccc"); - break; - case 2: - map.insert(1, "a"); - map.insert(2, "one"); - map.insertMulti(2, "two"); - map.insertMulti(2, "three"); - map.insert(3, "cccccc"); + switch (index) { + case 0: + default: + break; + case 1: + map.insert(1, "a"); + map.insert(2, "bbb"); + map.insert(3, "cccccc"); + break; + case 2: + map.insert(1, "a"); + map.insert(2, "one"); + map.insertMulti(2, "two"); + map.insertMulti(2, "three"); + map.insert(3, "cccccc"); } return map; } @@ -700,32 +669,32 @@ static QEasingCurve QEasingCurveData(int index) switch (index) { case 0: - default: - break; + default: + break; case 1: - easing.setType(QEasingCurve::Linear); - break; + easing.setType(QEasingCurve::Linear); + break; case 2: - easing.setType(QEasingCurve::OutCubic); - break; + easing.setType(QEasingCurve::OutCubic); + break; case 3: - easing.setType(QEasingCurve::InOutSine); - break; + easing.setType(QEasingCurve::InOutSine); + break; case 4: - easing.setType(QEasingCurve::InOutElastic); - easing.setPeriod(1.5); - easing.setAmplitude(2.0); - break; + easing.setType(QEasingCurve::InOutElastic); + easing.setPeriod(1.5); + easing.setAmplitude(2.0); + break; case 5: - easing.setType(QEasingCurve::OutInBack); - break; + easing.setType(QEasingCurve::OutInBack); + break; case 6: - easing.setType(QEasingCurve::OutCurve); - break; + easing.setType(QEasingCurve::OutCurve); + break; case 7: - easing.setType(QEasingCurve::InOutBack); - easing.setOvershoot(0.5); - break; + easing.setType(QEasingCurve::InOutBack); + easing.setOvershoot(0.5); + break; } return easing; } @@ -811,13 +780,12 @@ void tst_QDataStream::readqint64(QDataStream *s) static bool boolData(int index) { - switch (index) - { - case 0: return true; - case 1: return false; - case 2: return bool(2); - case 3: return bool(-1); - case 4: return bool(127); + switch (index) { + case 0: return true; + case 1: return false; + case 2: return bool(2); + case 3: return bool(-1); + case 4: return bool(127); } return false; @@ -852,13 +820,12 @@ void tst_QDataStream::readbool(QDataStream *s) static QBool QBoolData(int index) { - switch (index) - { - case 0: return QBool(true); - case 1: return QBool(false); - case 2: return QBool(bool(2)); - case 3: return QBool(bool(-1)); - case 4: return QBool(bool(127)); + switch (index) { + case 0: return QBool(true); + case 1: return QBool(false); + case 2: return QBool(bool(2)); + case 3: return QBool(bool(-1)); + case 4: return QBool(bool(127)); } return QBool(false); @@ -905,35 +872,34 @@ void tst_QDataStream::stream_QBool_in_4_0() static void QBitArrayData(QBitArray *b, int index) { QString filler = ""; - switch (index) - { - case 0: filler = ""; break; - case 1: filler = ""; break; - case 2: filler = "0"; break; - case 3: filler = "1"; break; - case 4: filler = "0000"; break; - case 5: filler = "0001"; break; - case 6: filler = "0010"; break; - case 7: filler = "0100"; break; - case 8: filler = "1000"; break; - case 9: filler = "1111"; break; - case 10: filler = "00000000"; break; - case 11: filler = "00000001"; break; - case 12: filler = "11111111"; break; - case 13: filler = "000000001"; break; - case 14: filler = "000000000001"; break; - case 15: filler = "0000000000000001"; break; - case 16: filler = "0101010101010101010101010101010101010101010101010101010101010101"; break; - case 17: filler = "1010101010101010101010101010101010101010101010101010101010101010"; break; - case 18: filler = "1111111111111111111111111111111111111111111111111111111111111111"; break; + switch (index) { + case 0: filler = ""; break; + case 1: filler = ""; break; + case 2: filler = "0"; break; + case 3: filler = "1"; break; + case 4: filler = "0000"; break; + case 5: filler = "0001"; break; + case 6: filler = "0010"; break; + case 7: filler = "0100"; break; + case 8: filler = "1000"; break; + case 9: filler = "1111"; break; + case 10: filler = "00000000"; break; + case 11: filler = "00000001"; break; + case 12: filler = "11111111"; break; + case 13: filler = "000000001"; break; + case 14: filler = "000000000001"; break; + case 15: filler = "0000000000000001"; break; + case 16: filler = "0101010101010101010101010101010101010101010101010101010101010101"; break; + case 17: filler = "1010101010101010101010101010101010101010101010101010101010101010"; break; + case 18: filler = "1111111111111111111111111111111111111111111111111111111111111111"; break; } b->resize(filler.length()); b->fill(0); // reset all bits to zero for (int i = 0; i < filler.length(); ++i) { - if (filler.at(i) == '1') - b->setBit(i, TRUE); + if (filler.at(i) == '1') + b->setBit(i, TRUE); } } @@ -968,19 +934,19 @@ void tst_QDataStream::readQBitArray(QDataStream *s) static QBrush qBrushData(int index) { - switch (index) - { - case 0: return QBrush(Qt::NoBrush); - case 1: return QBrush(Qt::SolidPattern); - case 2: return QBrush(Qt::Dense7Pattern); - case 3: return QBrush(Qt::red, Qt::NoBrush); - case 4: return QBrush(Qt::green, Qt::SolidPattern); - case 5: return QBrush(Qt::blue, Qt::Dense7Pattern); - case 6: { - QPixmap pm(open_xpm); - QBrush custom(Qt::black, pm); - return custom; - } + switch (index) { + case 0: return QBrush(Qt::NoBrush); + case 1: return QBrush(Qt::SolidPattern); + case 2: return QBrush(Qt::Dense7Pattern); + case 3: return QBrush(Qt::red, Qt::NoBrush); + case 4: return QBrush(Qt::green, Qt::SolidPattern); + case 5: return QBrush(Qt::blue, Qt::Dense7Pattern); + case 6: + { + QPixmap pm(open_xpm); + QBrush custom(Qt::black, pm); + return custom; + } case 7: QLinearGradient gradient(QPoint(2.718, 3.142), QPoint(3.1337, 42)); gradient.setCoordinateMode(QGradient::ObjectBoundingMode); @@ -1003,7 +969,7 @@ void tst_QDataStream::stream_QBrush_data() void tst_QDataStream::stream_QBrush() { if (QString(QTest::currentDataTag()).endsWith("6")) - QSKIP("Custom brushes don't seem to be supported with QDataStream", SkipSingle); + QSKIP("Custom brushes don't seem to be supported with QDataStream", SkipSingle); STREAM_IMPL(QBrush); } @@ -1027,16 +993,15 @@ void tst_QDataStream::readQBrush(QDataStream *s) static QColor QColorData(int index) { - switch (index) - { - case 0: return QColor(0,0,0); - case 1: return QColor(0,0,0); - case 2: return QColor(0,0,0); - case 3: return QColor(0,0,0); - case 4: return QColor(0,0,0); - case 5: return QColor(0,0,0); - case 6: return QColor(0,0,0); - case 7: return QColor(0,0,0); + switch (index) { + case 0: return QColor(0,0,0); + case 1: return QColor(0,0,0); + case 2: return QColor(0,0,0); + case 3: return QColor(0,0,0); + case 4: return QColor(0,0,0); + case 5: return QColor(0,0,0); + case 6: return QColor(0,0,0); + case 7: return QColor(0,0,0); } return QColor(0,0,0); @@ -1071,16 +1036,15 @@ void tst_QDataStream::readQColor(QDataStream *s) static QByteArray qByteArrayData(int index) { - switch (index) - { - case 0: return QByteArray(); - case 1: return QByteArray(""); - case 2: return QByteArray("foo"); - case 3: return QByteArray("foo bar"); - case 4: return QByteArray("two\nlines"); - case 5: return QByteArray("ABCDEFG"); - case 6: return QByteArray("baec zxv 123"); // kept for nostalgic reasons - case 7: return QByteArray("jbc;UBC;jd clhdbcahd vcbd vgdv dhvb laifv kadf jkhfbvljd khd lhvjh "); + switch (index) { + case 0: return QByteArray(); + case 1: return QByteArray(""); + case 2: return QByteArray("foo"); + case 3: return QByteArray("foo bar"); + case 4: return QByteArray("two\nlines"); + case 5: return QByteArray("ABCDEFG"); + case 6: return QByteArray("baec zxv 123"); // kept for nostalgic reasons + case 7: return QByteArray("jbc;UBC;jd clhdbcahd vcbd vgdv dhvb laifv kadf jkhfbvljd khd lhvjh "); } return QByteArray("foo"); @@ -1114,22 +1078,16 @@ void tst_QDataStream::readQByteArray(QDataStream *s) #ifndef QT_NO_CURSOR static QCursor qCursorData(int index) { - switch (index) - { -#ifdef QT3_SUPPORT - case 0: return QCursor(Qt::arrowCursor); - case 1: return QCursor(Qt::waitCursor); -#else + switch (index) { case 0: return QCursor(Qt::ArrowCursor); case 1: return QCursor(Qt::WaitCursor); -#endif - case 2: return QCursor(Qt::BitmapCursor); - case 3: return QCursor(Qt::BlankCursor); - case 4: return QCursor(Qt::BlankCursor); - case 5: return QCursor(QPixmap(open_xpm), 1, 1); - case 6: { QPixmap pm(open_xpm); return QCursor(QBitmap(pm), pm.mask(), 3, 4); } - case 7: return QCursor(QPixmap(open_xpm), -1, 5); - case 8: return QCursor(QPixmap(open_xpm), 5, -1); + case 2: return QCursor(Qt::BitmapCursor); + case 3: return QCursor(Qt::BlankCursor); + case 4: return QCursor(Qt::BlankCursor); + case 5: return QCursor(QPixmap(open_xpm), 1, 1); + case 6: { QPixmap pm(open_xpm); return QCursor(QBitmap(pm), pm.mask(), 3, 4); } + case 7: return QCursor(QPixmap(open_xpm), -1, 5); + case 8: return QCursor(QPixmap(open_xpm), 5, -1); } return QCursor(); @@ -1169,10 +1127,10 @@ void tst_QDataStream::readQCursor(QDataStream *s) QVERIFY(d5.hotSpot() == test.hotSpot()); QVERIFY((d5.bitmap() != 0 && test.bitmap() != 0) || (d5.bitmap() == 0 && test.bitmap() == 0)); if (d5.bitmap() != 0) - QVERIFY(pixmapsAreEqual(d5.bitmap(), test.bitmap())); + QVERIFY(pixmapsAreEqual(d5.bitmap(), test.bitmap())); QVERIFY((d5.mask() != 0 && test.mask() != 0) || (d5.mask() == 0 && test.mask() == 0)); if (d5.mask() != 0) - QVERIFY(pixmapsAreEqual(d5.mask(), test.mask())); + QVERIFY(pixmapsAreEqual(d5.mask(), test.mask())); #endif } @@ -1180,24 +1138,23 @@ void tst_QDataStream::readQCursor(QDataStream *s) static QDate qDateData(int index) { - switch (index) - { - case 0: return QDate(1752, 9, 14); // the first valid date - case 1: return QDate(1900, 1, 1); - case 2: return QDate(1976, 4, 5); - case 3: return QDate(1960, 5, 27); - case 4: return QDate(1999, 12, 31); // w2k effects? - case 5: return QDate(2000, 1, 1); - case 6: return QDate(2050, 1, 1);// test some values far in the future too - case 7: return QDate(3001, 12, 31); - case 8: return QDate(4002, 1, 1); - case 9: return QDate(4003, 12, 31); - case 10: return QDate(5004, 1, 1); - case 11: return QDate(5005, 12, 31); - case 12: return QDate(6006, 1, 1); - case 13: return QDate(6007, 12, 31); - case 14: return QDate(7008, 1, 1); - case 15: return QDate(7009, 12, 31); + switch (index) { + case 0: return QDate(1752, 9, 14); // the first valid date + case 1: return QDate(1900, 1, 1); + case 2: return QDate(1976, 4, 5); + case 3: return QDate(1960, 5, 27); + case 4: return QDate(1999, 12, 31); // w2k effects? + case 5: return QDate(2000, 1, 1); + case 6: return QDate(2050, 1, 1);// test some values far in the future too + case 7: return QDate(3001, 12, 31); + case 8: return QDate(4002, 1, 1); + case 9: return QDate(4003, 12, 31); + case 10: return QDate(5004, 1, 1); + case 11: return QDate(5005, 12, 31); + case 12: return QDate(6006, 1, 1); + case 13: return QDate(6007, 12, 31); + case 14: return QDate(7008, 1, 1); + case 15: return QDate(7009, 12, 31); } return QDate(); } @@ -1231,8 +1188,7 @@ void tst_QDataStream::readQDate(QDataStream *s) static QTime qTimeData(int index) { - switch (index) - { + switch (index) { case 0 : return QTime(0, 0, 0, 0); case 1 : return QTime(0, 0, 0, 1); case 2 : return QTime(0, 0, 0, 99); @@ -1326,24 +1282,23 @@ void tst_QDataStream::readQTime(QDataStream *s) static QDateTime qDateTimeData(int index) { - switch (index) - { - case 0: return QDateTime(QDate(1900, 1, 1), QTime(0,0,0,0)); - case 1: return QDateTime(QDate(1900, 1, 2), QTime(1,1,1,1)); - case 2: return QDateTime(QDate(1900, 1, 3), QTime(12,0,0,0)); - case 3: return QDateTime(QDate(1900, 1, 4), QTime(23,59,59,999)); - case 4: return QDateTime(QDate(1999, 1, 1), QTime(0,0,0,0)); - case 5: return QDateTime(QDate(1999, 1, 2), QTime(1,1,1,1)); - case 6: return QDateTime(QDate(1999, 1, 3), QTime(12,0,0,0)); - case 7: return QDateTime(QDate(1999, 1, 4), QTime(23,59,59,999)); - case 8: return QDateTime(QDate(2000, 1, 1), QTime(0,0,0,0)); - case 9: return QDateTime(QDate(2000, 1, 2), QTime(1,1,1,1)); - case 10: return QDateTime(QDate(2000, 1, 3), QTime(12,0,0,0)); - case 11: return QDateTime(QDate(2000, 1, 4), QTime(23,59,59,999)); - case 12: return QDateTime(QDate(2000, 12, 31), QTime(0,0,0,0)); - case 13: return QDateTime(QDate(2000, 12, 31), QTime(1,1,1,1)); - case 14: return QDateTime(QDate(2000, 12, 31), QTime(12,0,0,0)); - case 15: return QDateTime(QDate(2000, 12, 31), QTime(23,59,59,999)); + switch (index) { + case 0: return QDateTime(QDate(1900, 1, 1), QTime(0,0,0,0)); + case 1: return QDateTime(QDate(1900, 1, 2), QTime(1,1,1,1)); + case 2: return QDateTime(QDate(1900, 1, 3), QTime(12,0,0,0)); + case 3: return QDateTime(QDate(1900, 1, 4), QTime(23,59,59,999)); + case 4: return QDateTime(QDate(1999, 1, 1), QTime(0,0,0,0)); + case 5: return QDateTime(QDate(1999, 1, 2), QTime(1,1,1,1)); + case 6: return QDateTime(QDate(1999, 1, 3), QTime(12,0,0,0)); + case 7: return QDateTime(QDate(1999, 1, 4), QTime(23,59,59,999)); + case 8: return QDateTime(QDate(2000, 1, 1), QTime(0,0,0,0)); + case 9: return QDateTime(QDate(2000, 1, 2), QTime(1,1,1,1)); + case 10: return QDateTime(QDate(2000, 1, 3), QTime(12,0,0,0)); + case 11: return QDateTime(QDate(2000, 1, 4), QTime(23,59,59,999)); + case 12: return QDateTime(QDate(2000, 12, 31), QTime(0,0,0,0)); + case 13: return QDateTime(QDate(2000, 12, 31), QTime(1,1,1,1)); + case 14: return QDateTime(QDate(2000, 12, 31), QTime(12,0,0,0)); + case 15: return QDateTime(QDate(2000, 12, 31), QTime(23,59,59,999)); } return QDateTime(QDate(1900, 1, 1), QTime(0,0,0)); } @@ -1377,83 +1332,82 @@ void tst_QDataStream::readQDateTime(QDataStream *s) static QFont qFontData(int index) { - switch (index) - { - case 0: return QFont("Courier", 20, QFont::Bold, TRUE); - case 1: return QFont("Courier", 18, QFont::Bold, FALSE); - case 2: return QFont("Courier", 16, QFont::Light, TRUE); - case 3: return QFont("Courier", 14, QFont::Normal, FALSE); - case 4: return QFont("Courier", 12, QFont::DemiBold, TRUE); - case 5: return QFont("Courier", 10, QFont::Black, FALSE); - case 6: - { - QFont f("Helvetica", 10, QFont::Normal, FALSE); - f.setPixelSize(2); - f.setUnderline(FALSE); - f.setStrikeOut(FALSE); - f.setFixedPitch(FALSE); - return f; - } - case 7: - { - QFont f("Helvetica", 10, QFont::Bold, FALSE); - f.setPixelSize(4); - f.setUnderline(TRUE); - f.setStrikeOut(FALSE); - f.setFixedPitch(FALSE); - return f; - } - case 8: - { - QFont f("Helvetica", 10, QFont::Light, FALSE); - f.setPixelSize(6); - f.setUnderline(FALSE); - f.setStrikeOut(TRUE); - f.setFixedPitch(FALSE); - return f; - } - case 9: - { - QFont f("Helvetica", 10, QFont::DemiBold, FALSE); - f.setPixelSize(8); - f.setUnderline(FALSE); - f.setStrikeOut(FALSE); - f.setFixedPitch(TRUE); - return f; - } - case 10: - { - QFont f("Helvetica", 10, QFont::Black, FALSE); - f.setPixelSize(10); - f.setUnderline(TRUE); - f.setStrikeOut(TRUE); - f.setFixedPitch(FALSE); - return f; - } - case 11: - { - QFont f("Helvetica", 10, QFont::Normal, TRUE); - f.setPixelSize(12); - f.setUnderline(FALSE); - f.setStrikeOut(TRUE); - f.setFixedPitch(TRUE); - return f; - } - case 12: - { - QFont f("Helvetica", 10, QFont::Bold, TRUE); - f.setPixelSize(14); - f.setUnderline(TRUE); - f.setStrikeOut(TRUE); - f.setFixedPitch(TRUE); - return f; - } - case 13: - { - QFont f("Helvetica", 10, QFont::Bold, TRUE); - f.setStretch(200); - return f; - } + switch (index) { + case 0: return QFont("Courier", 20, QFont::Bold, TRUE); + case 1: return QFont("Courier", 18, QFont::Bold, FALSE); + case 2: return QFont("Courier", 16, QFont::Light, TRUE); + case 3: return QFont("Courier", 14, QFont::Normal, FALSE); + case 4: return QFont("Courier", 12, QFont::DemiBold, TRUE); + case 5: return QFont("Courier", 10, QFont::Black, FALSE); + case 6: + { + QFont f("Helvetica", 10, QFont::Normal, FALSE); + f.setPixelSize(2); + f.setUnderline(FALSE); + f.setStrikeOut(FALSE); + f.setFixedPitch(FALSE); + return f; + } + case 7: + { + QFont f("Helvetica", 10, QFont::Bold, FALSE); + f.setPixelSize(4); + f.setUnderline(TRUE); + f.setStrikeOut(FALSE); + f.setFixedPitch(FALSE); + return f; + } + case 8: + { + QFont f("Helvetica", 10, QFont::Light, FALSE); + f.setPixelSize(6); + f.setUnderline(FALSE); + f.setStrikeOut(TRUE); + f.setFixedPitch(FALSE); + return f; + } + case 9: + { + QFont f("Helvetica", 10, QFont::DemiBold, FALSE); + f.setPixelSize(8); + f.setUnderline(FALSE); + f.setStrikeOut(FALSE); + f.setFixedPitch(TRUE); + return f; + } + case 10: + { + QFont f("Helvetica", 10, QFont::Black, FALSE); + f.setPixelSize(10); + f.setUnderline(TRUE); + f.setStrikeOut(TRUE); + f.setFixedPitch(FALSE); + return f; + } + case 11: + { + QFont f("Helvetica", 10, QFont::Normal, TRUE); + f.setPixelSize(12); + f.setUnderline(FALSE); + f.setStrikeOut(TRUE); + f.setFixedPitch(TRUE); + return f; + } + case 12: + { + QFont f("Helvetica", 10, QFont::Bold, TRUE); + f.setPixelSize(14); + f.setUnderline(TRUE); + f.setStrikeOut(TRUE); + f.setFixedPitch(TRUE); + return f; + } + case 13: + { + QFont f("Helvetica", 10, QFont::Bold, TRUE); + f.setStretch(200); + return f; + } } return QFont("Courier", 18, QFont::Bold, TRUE); } @@ -1513,7 +1467,6 @@ void tst_QDataStream::stream_QImage() void tst_QDataStream::writeQImage(QDataStream *s) { QImage d12(open_xpm); - //debug("Orig alpha: %i", (int)d12.hasAlphaBuffer()); *s << d12; } @@ -1532,239 +1485,79 @@ void tst_QDataStream::readQImage(QDataStream *s) QVERIFY(d12.height() == ref.height()); QVERIFY(d12.depth() == ref.depth()); QVERIFY(d12.colorCount() == ref.colorCount()); -#ifdef QT3_SUPPORT - QVERIFY(d12.hasAlphaBuffer() == ref.hasAlphaBuffer()); -#else QVERIFY(d12.hasAlphaChannel() == ref.hasAlphaChannel()); -#endif -// qDebug("Alpha: %i %i", (int)d12.hasAlphaBuffer(), ref.hasAlphaBuffer()); -// qDebug("Feil %i %i: %x != %x", 3, 0, d12.pixel(3, 0), ref.pixel(3, 0)); -// // ################ Bug : ref and orig has ff in alpha; readback has 0 // ### (Was like this in 1.44 as well) // // for(int i = 0; i < d12.height(); i++) -// for(int j = 0; j < d12.width(); j++) -// if (d12.pixel(j, i) != ref.pixel(j, i)) -// qDebug("Feil %i %i", j, i); +// for(int j = 0; j < d12.width(); j++) +// if (d12.pixel(j, i) != ref.pixel(j, i)) +// qDebug("Feil %i %i", j, i); // } -// ************************************ -#ifdef QT3_SUPPORT -static QPalette qPaletteData(int index) -{ - QColorGroup g1( - QBrush(Qt::red, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::green, Qt::Dense2Pattern), - QBrush(Qt::blue, Qt::Dense3Pattern), - QBrush(Qt::cyan, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern)); - QColorGroup g2( - QBrush(Qt::cyan, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern), - QBrush(Qt::green, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::red, Qt::Dense2Pattern)); - QColorGroup g3( - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::red, Qt::CrossPattern), - QBrush(Qt::gray, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::cyan, Qt::Dense2Pattern), - QBrush(Qt::magenta, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern)); - - switch (index) - { - case 0: return QPalette(Qt::green); - case 1: return QPalette(Qt::cyan, Qt::blue); - case 2: return QPalette(Qt::red, Qt::yellow); - case 3: return QPalette(g1, g2, g3); - case 4: return QPalette(g2, g3, g1); - case 5: return QPalette(g3, g1, g2); - case 6: return QPalette(g3, g2, g1); - } - return QPalette(Qt::black); -} -#endif -#define MAX_QPALETTE_DATA 7 - -void tst_QDataStream::stream_QPalette_data() -{ - stream_data(MAX_QPALETTE_DATA); -} - -void tst_QDataStream::stream_QPalette() -{ - STREAM_IMPL(QPalette); -} - -void tst_QDataStream::writeQPalette(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QPalette d13(qPaletteData(dataIndex(QTest::currentDataTag()))); - *s << d13; -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -void tst_QDataStream::readQPalette(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QPalette test(qPaletteData(dataIndex(QTest::currentDataTag()))); - QPalette d13; - *s >> d13; - QVERIFY(d13 == test); - QVERIFY(d13.active() == test.active()); - QVERIFY(d13.inactive() == test.inactive()); - QVERIFY(d13.disabled() == test.disabled()); -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -// ************************************ -#ifdef QT3_SUPPORT -static QColorGroup QColorGroupData(int index) -{ - switch (index) - { - case 0: return QColorGroup( - QBrush(Qt::red, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::green, Qt::Dense2Pattern), - QBrush(Qt::blue, Qt::Dense3Pattern), - QBrush(Qt::cyan, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern)); - case 1: return QColorGroup( - QBrush(Qt::cyan, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern), - QBrush(Qt::green, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::red, Qt::Dense2Pattern)); - case 2: return QColorGroup( - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::red, Qt::CrossPattern), - QBrush(Qt::gray, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::cyan, Qt::Dense2Pattern), - QBrush(Qt::magenta, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern)); - } - return QColorGroup(); -} -#endif - -#define MAX_QCOLORGROUP_DATA 3 - -void tst_QDataStream::stream_QColorGroup_data() -{ - stream_data(MAX_QCOLORGROUP_DATA); -} - -void tst_QDataStream::stream_QColorGroup() -{ - STREAM_IMPL(QColorGroup); -} - -void tst_QDataStream::writeQColorGroup(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QColorGroup d13(QColorGroupData(dataIndex(QTest::currentDataTag()))); - *s << d13; -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -void tst_QDataStream::readQColorGroup(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QColorGroup test(QColorGroupData(dataIndex(QTest::currentDataTag()))); - QColorGroup d14; - *s >> d14; - QVERIFY(d14 == test); -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - // ************************************ static QPen qPenData(int index) { - switch (index) - { - case 0: { - QPen p(Qt::blue, 0, Qt::NoPen); - p.setCapStyle(Qt::FlatCap); - p.setJoinStyle(Qt::MiterJoin); - return p; - } - case 1: { - QPen p(Qt::red, 1, Qt::SolidLine); - p.setCapStyle(Qt::SquareCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } - case 2: { - QPen p(Qt::red, 4, Qt::DashDotDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::RoundJoin); - return p; - } - case 3: { - QPen p(Qt::blue, 12, Qt::NoPen); - p.setCapStyle(Qt::FlatCap); - p.setJoinStyle(Qt::RoundJoin); - return p; - } - case 4: { - QPen p(Qt::red, 99, Qt::SolidLine); - p.setCapStyle(Qt::SquareCap); - p.setJoinStyle(Qt::MiterJoin); - return p; - } - case 5: { - QPen p(Qt::red, 255, Qt::DashDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } - case 6: { - QPen p(Qt::red, 256, Qt::DashDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } - case 7: { - QPen p(Qt::red, 0.25, Qt::DashDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } + switch (index) { + case 0: + { + QPen p(Qt::blue, 0, Qt::NoPen); + p.setCapStyle(Qt::FlatCap); + p.setJoinStyle(Qt::MiterJoin); + return p; + } + case 1: + { + QPen p(Qt::red, 1, Qt::SolidLine); + p.setCapStyle(Qt::SquareCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } + case 2: + { + QPen p(Qt::red, 4, Qt::DashDotDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::RoundJoin); + return p; + } + case 3: + { + QPen p(Qt::blue, 12, Qt::NoPen); + p.setCapStyle(Qt::FlatCap); + p.setJoinStyle(Qt::RoundJoin); + return p; + } + case 4: + { + QPen p(Qt::red, 99, Qt::SolidLine); + p.setCapStyle(Qt::SquareCap); + p.setJoinStyle(Qt::MiterJoin); + return p; + } + case 5: + { + QPen p(Qt::red, 255, Qt::DashDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } + case 6: + { + QPen p(Qt::red, 256, Qt::DashDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } + case 7: + { + QPen p(Qt::red, 0.25, Qt::DashDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } } return QPen(); @@ -1857,12 +1650,6 @@ void tst_QDataStream::readQPixmap(QDataStream *s) QVERIFY(d16.size() == pm.size()); QVERIFY(d16.rect() == pm.rect()); QVERIFY(d16.depth() == pm.depth()); - // bit depth must be 24 or above for pixmap comparison -#ifdef QT3_SUPPORT - if (Q3PaintDeviceMetrics(&pm).depth() < 24) - QSKIP("Don't do pixmap comparison when depth < 24", SkipAll); - QCOMPARE(d16, QPixmap(pm)); -#endif } void tst_QDataStream::writeQIcon(QDataStream *s) @@ -1870,9 +1657,6 @@ void tst_QDataStream::writeQIcon(QDataStream *s) QPixmap pm(open_xpm); QIcon d16(pm); *s << d16; - - QIcon svg(svgFile); - *s << svg; } void tst_QDataStream::readQIcon(QDataStream *s) @@ -1883,43 +1667,24 @@ void tst_QDataStream::readQIcon(QDataStream *s) *s >> d16; QVERIFY(!d16.isNull() && !icon.isNull()); QCOMPARE(d16.pixmap(100), pm); - - QIcon svg; - *s >> svg; - QVERIFY(!svg.isNull()); - - QImage image(200, 200, QImage::Format_ARGB32_Premultiplied); - image.fill(0); - QPainter p(&image); - p.drawPixmap(0, 0, svg.pixmap(200, 200)); - p.end(); - - QIcon svg2(svgFile); - QImage image2(200, 200, QImage::Format_ARGB32_Premultiplied); - image2.fill(0); - p.begin(&image2); - p.drawPixmap(0, 0, svg2.pixmap(200, 200)); - p.end(); - QCOMPARE(image, image2); } // ************************************ QPoint qPointData(int index) { - switch (index) - { - case 0: return QPoint(0, 0); - case 1: return QPoint(-1, 0); - case 2: return QPoint(0, -1); - case 3: return QPoint(1, 0); - case 4: return QPoint(0, 1); - case 5: return QPoint(-1, -1); - case 6: return QPoint(1, 1); - case 7: return QPoint(255, 255); - case 8: return QPoint(256, 256); - case 9: return QPoint(-254, -254); - case 10: return QPoint(-255, -255); + switch (index) { + case 0: return QPoint(0, 0); + case 1: return QPoint(-1, 0); + case 2: return QPoint(0, -1); + case 3: return QPoint(1, 0); + case 4: return QPoint(0, 1); + case 5: return QPoint(-1, -1); + case 6: return QPoint(1, 1); + case 7: return QPoint(255, 255); + case 8: return QPoint(256, 256); + case 9: return QPoint(-254, -254); + case 10: return QPoint(-255, -255); } return QPoint(); @@ -1962,19 +1727,18 @@ void tst_QDataStream::readQPoint(QDataStream *s) static QRect qRectData(int index) { - switch (index) - { - case 0: return QRect(0, 0, 0, 0); - case 1: return QRect(1, 1, 1, 1); - case 2: return QRect(1, 2, 3, 4); - case 3: return QRect(-1, -1, -1, -1); - case 4: return QRect(-1, -2, -3, -4); - case 5: return QRect(255, -5, 256, -6); - case 6: return QRect(-7, 255, -8, 256); - case 7: return QRect(9, -255, 10, -255); - case 8: return QRect(-255, 11, -255, 12); - case 9: return QRect(256, 512, 1024, 2048); - case 10: return QRect(-256, -512, -1024, -2048); + switch (index) { + case 0: return QRect(0, 0, 0, 0); + case 1: return QRect(1, 1, 1, 1); + case 2: return QRect(1, 2, 3, 4); + case 3: return QRect(-1, -1, -1, -1); + case 4: return QRect(-1, -2, -3, -4); + case 5: return QRect(255, -5, 256, -6); + case 6: return QRect(-7, 255, -8, 256); + case 7: return QRect(9, -255, 10, -255); + case 8: return QRect(-255, 11, -255, 12); + case 9: return QRect(256, 512, 1024, 2048); + case 10: return QRect(-256, -512, -1024, -2048); } return QRect(); } @@ -2031,57 +1795,63 @@ static QPolygon qPolygonData(int index) QPoint p13(-99998, -34567); QPoint p14(45678, -99999); - switch (index) - { - case 0: return QPolygon(0); - case 1: { - QPolygon p(1); - p.setPoint(0, p0); - return p; - } - case 2: { - QPolygon p(1); - p.setPoint(0, p5); - return p; - } - case 3: { - QPolygon p(1); - p.setPoint(0, p12); - return p; - } - case 4: { - QPolygon p(3); - p.setPoint(0, p1); - p.setPoint(1, p10); - p.setPoint(2, p13); - return p; - } - case 5: { - QPolygon p(6); - p.setPoint(0, p2); - p.setPoint(1, p11); - p.setPoint(2, p14); - return p; - } - case 6: { - QPolygon p(15); - p.setPoint(0, p0); - p.setPoint(1, p1); - p.setPoint(2, p2); - p.setPoint(3, p3); - p.setPoint(4, p4); - p.setPoint(5, p5); - p.setPoint(6, p6); - p.setPoint(7, p7); - p.setPoint(8, p8); - p.setPoint(9, p9); - p.setPoint(10, p10); - p.setPoint(11, p11); - p.setPoint(12, p12); - p.setPoint(13, p13); - p.setPoint(14, p14); - return p; - } + switch (index) { + case 0: + return QPolygon(0); + case 1: + { + QPolygon p(1); + p.setPoint(0, p0); + return p; + } + case 2: + { + QPolygon p(1); + p.setPoint(0, p5); + return p; + } + case 3: + { + QPolygon p(1); + p.setPoint(0, p12); + return p; + } + case 4: + { + QPolygon p(3); + p.setPoint(0, p1); + p.setPoint(1, p10); + p.setPoint(2, p13); + return p; + } + case 5: + { + QPolygon p(6); + p.setPoint(0, p2); + p.setPoint(1, p11); + p.setPoint(2, p14); + return p; + } + case 6: + { + QPolygon p(15); + p.setPoint(0, p0); + p.setPoint(1, p1); + p.setPoint(2, p2); + p.setPoint(3, p3); + p.setPoint(4, p4); + p.setPoint(5, p5); + p.setPoint(6, p6); + p.setPoint(7, p7); + p.setPoint(8, p8); + p.setPoint(9, p9); + p.setPoint(10, p10); + p.setPoint(11, p11); + p.setPoint(12, p12); + p.setPoint(13, p13); + p.setPoint(14, p14); + return p; + } } return QRect(); } @@ -2122,32 +1892,32 @@ void tst_QDataStream::readQPolygon(QDataStream *s) static QRegion qRegionData(int index) { - switch (index) - { - case 0: return QRegion(0, 0, 0, 0, QRegion::Rectangle); - case 1: { - QRegion r(1, 2, 300, 400, QRegion::Rectangle); - if (r != QRegion(1, 2, 300, 400, QRegion::Rectangle)) - qDebug("Error creating a region"); - return r; - } - case 2: return QRegion(100, 100, 1024, 768, QRegion::Rectangle); - case 3: return QRegion(-100, -100, 1024, 1024, QRegion::Rectangle); - case 4: return QRegion(100, -100, 2048, 4096, QRegion::Rectangle); - case 5: return QRegion(-100, 100, 4096, 2048, QRegion::Rectangle); - case 6: return QRegion(0, 0, 0, 0, QRegion::Ellipse); + switch (index) { + case 0: return QRegion(0, 0, 0, 0, QRegion::Rectangle); + case 1: + { + QRegion r(1, 2, 300, 400, QRegion::Rectangle); + if (r != QRegion(1, 2, 300, 400, QRegion::Rectangle)) + qDebug("Error creating a region"); + return r; + } + case 2: return QRegion(100, 100, 1024, 768, QRegion::Rectangle); + case 3: return QRegion(-100, -100, 1024, 1024, QRegion::Rectangle); + case 4: return QRegion(100, -100, 2048, 4096, QRegion::Rectangle); + case 5: return QRegion(-100, 100, 4096, 2048, QRegion::Rectangle); + case 6: return QRegion(0, 0, 0, 0, QRegion::Ellipse); #if defined(Q_OS_SYMBIAN) || (!defined(Q_OS_UNIX) && !defined(Q_OS_WINCE)) // all our Unix platforms use X regions. - case 7: return QRegion(1, 2, 300, 400, QRegion::Ellipse); - case 8: return QRegion(100, 100, 1024, 768, QRegion::Ellipse); - case 9: return QRegion(-100, -100, 1024, 1024, QRegion::Ellipse); - case 10: return QRegion(100, -100, 2048, 4096, QRegion::Ellipse); - case 11: return QRegion(-100, 100, 4096, 2048, QRegion::Ellipse); - // simplest X11 case that fails: - case 12: return QRegion(0, 0, 3, 3, QRegion::Ellipse); + case 7: return QRegion(1, 2, 300, 400, QRegion::Ellipse); + case 8: return QRegion(100, 100, 1024, 768, QRegion::Ellipse); + case 9: return QRegion(-100, -100, 1024, 1024, QRegion::Ellipse); + case 10: return QRegion(100, -100, 2048, 4096, QRegion::Ellipse); + case 11: return QRegion(-100, 100, 4096, 2048, QRegion::Ellipse); + // simplest X11 case that fails: + case 12: return QRegion(0, 0, 3, 3, QRegion::Ellipse); #else - case 7: - qWarning("Skipping streaming of elliptical regions on embedded, Mac OS X, and X11;" - " our pointarray stuff is not that great at approximating."); + case 7: + qWarning("Skipping streaming of elliptical regions on embedded, Mac OS X, and X11;" + " our pointarray stuff is not that great at approximating."); #endif } return QRegion(); @@ -2182,19 +1952,18 @@ void tst_QDataStream::readQRegion(QDataStream *s) static QSize qSizeData(int index) { - switch (index) - { - case 0: return QSize(0, 0); - case 1: return QSize(-1, 0); - case 2: return QSize(0, -1); - case 3: return QSize(1, 0); - case 4: return QSize(0, 1); - case 5: return QSize(-1, -1); - case 6: return QSize(1, 1); - case 7: return QSize(255, 255); - case 8: return QSize(256, 256); - case 9: return QSize(-254, -254); - case 10: return QSize(-255, -255); + switch (index) { + case 0: return QSize(0, 0); + case 1: return QSize(-1, 0); + case 2: return QSize(0, -1); + case 3: return QSize(1, 0); + case 4: return QSize(0, 1); + case 5: return QSize(-1, -1); + case 6: return QSize(1, 1); + case 7: return QSize(255, 255); + case 8: return QSize(256, 256); + case 9: return QSize(-254, -254); + case 10: return QSize(-255, -255); } return QSize(); } @@ -2231,50 +2000,6 @@ void tst_QDataStream::readQSize(QDataStream *s) QVERIFY(d21f == QSizeF(ref)); } -// ************************************ - -void tst_QDataStream::stream_QWMatrix_data() -{ - stream_data(1); -} - -void tst_QDataStream::stream_QWMatrix() -{ - STREAM_IMPL(QWMatrix); -} - -void tst_QDataStream::writeQWMatrix(QDataStream *s) -{ -#ifdef QT3_SUPPORT - // QStringList: Qt 2.0 specific - QWMatrix d23(1.2, 2.3, 3.4, 4.5, 5.6, 6.7); - *s << d23; -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -void tst_QDataStream::readQWMatrix(QDataStream *s) -{ -#ifdef QT3_SUPPORT - // QStringList: Qt 2.0 specific - - QWMatrix d23; - *s >> d23; - // QVERIFY(d23 == QWMatrix(1.2, 2.3, 3.4, 4.5, 5.6, 6.7)); - QWMatrix m(1.2, 2.3, 3.4, 4.5, 5.6, 6.7); - // Because of double vs. float rounding differences: - QVERIFY(QABS(d23.m11() - m.m11()) < 1e-6); - QVERIFY(QABS(d23.m12() - m.m12()) < 1e-6); - QVERIFY(QABS(d23.m21() - m.m21()) < 1e-6); - QVERIFY(QABS(d23.m22() - m.m22()) < 1e-6); - QVERIFY(QABS(d23.dx() - m.dx()) < 1e-6); - QVERIFY(QABS(d23.dy() - m.dy()) < 1e-6); -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - // *********************** atEnd ****************************** void tst_QDataStream::stream_atEnd_data() @@ -2286,64 +2011,60 @@ void tst_QDataStream::stream_atEnd() { QFETCH(QString, device); if (device == "bytearray") { - QByteArray ba; - QDataStream sout(&ba, QIODevice::WriteOnly); - writeQString(&sout); + QByteArray ba; + QDataStream sout(&ba, QIODevice::WriteOnly); + writeQString(&sout); - QDataStream sin(&ba, QIODevice::ReadOnly); - readQString(&sin); - QVERIFY(sin.atEnd()); + QDataStream sin(&ba, QIODevice::ReadOnly); + readQString(&sin); + QVERIFY(sin.atEnd()); } else if (device == "file") { - QString fileName = "qdatastream.out"; - QFile fOut(fileName); - QVERIFY(fOut.open(QIODevice::WriteOnly)); - QDataStream sout(&fOut); - writeQString(&sout); - fOut.close(); + QString fileName = "qdatastream.out"; + QFile fOut(fileName); + QVERIFY(fOut.open(QIODevice::WriteOnly)); + QDataStream sout(&fOut); + writeQString(&sout); + fOut.close(); - QFile fIn(fileName); - QVERIFY(fIn.open(QIODevice::ReadOnly)); - QDataStream sin(&fIn); - readQString(&sin); - QVERIFY(sin.atEnd()); - fIn.close(); + QFile fIn(fileName); + QVERIFY(fIn.open(QIODevice::ReadOnly)); + QDataStream sin(&fIn); + readQString(&sin); + QVERIFY(sin.atEnd()); + fIn.close(); } else if (device == "buffer") { - { - QByteArray ba(0); - QBuffer bOut(&ba); - bOut.open(QIODevice::WriteOnly); - QDataStream sout(&bOut); - writeQString(&sout); - bOut.close(); + { + QByteArray ba(0); + QBuffer bOut(&ba); + bOut.open(QIODevice::WriteOnly); + QDataStream sout(&bOut); + writeQString(&sout); + bOut.close(); - QBuffer bIn(&ba); - bIn.open(QIODevice::ReadOnly); - QDataStream sin(&bIn); - readQString(&sin); - QVERIFY(sin.atEnd()); - bIn.close(); - } + QBuffer bIn(&ba); + bIn.open(QIODevice::ReadOnly); + QDataStream sin(&bIn); + readQString(&sin); + QVERIFY(sin.atEnd()); + bIn.close(); + } - // Do the same test again, but this time with an initial size for the bytearray. - { -#ifdef QT3_SUPPORT - QByteArray ba(10000); -#else - QByteArray ba(10000, '\0'); -#endif - QBuffer bOut(&ba); - bOut.open(QIODevice::WriteOnly | QIODevice::Truncate); - QDataStream sout(&bOut); - writeQString(&sout); - bOut.close(); + // Do the same test again, but this time with an initial size for the bytearray. + { + QByteArray ba(10000, '\0'); + QBuffer bOut(&ba); + bOut.open(QIODevice::WriteOnly | QIODevice::Truncate); + QDataStream sout(&bOut); + writeQString(&sout); + bOut.close(); - QBuffer bIn(&ba); - bIn.open(QIODevice::ReadOnly); - QDataStream sin(&bIn); - readQString(&sin); - QVERIFY(sin.atEnd()); - bIn.close(); - } + QBuffer bIn(&ba); + bIn.open(QIODevice::ReadOnly); + QDataStream sin(&bIn); + readQString(&sin); + QVERIFY(sin.atEnd()); + bIn.close(); + } } } @@ -2429,8 +2150,6 @@ void tst_QDataStream::setVersion_data() for (int vers = 1; vers <= latest.version(); ++vers) QTest::newRow(qPrintable(QString("v_%1").arg(vers))) << vers; - - } void tst_QDataStream::setVersion() @@ -2438,8 +2157,8 @@ void tst_QDataStream::setVersion() QDataStream latest; QFETCH(int, vers); - /* - Test QKeySequence. + /* + Test QKeySequence. */ QByteArray ba1; { @@ -2463,12 +2182,11 @@ void tst_QDataStream::setVersion() QVERIFY(deadbeef == 0xDEADBEEF); } - /* - Test QPalette. + /* + Test QPalette. */ - - // revise the test if new color roles or color groups are added + // revise the test if new color roles or color groups are added QVERIFY(QPalette::NColorRoles == QPalette::ToolTipText + 1); QVERIFY(QPalette::NColorGroups == 3); @@ -2476,7 +2194,7 @@ void tst_QDataStream::setVersion() QPalette pal1, pal2; for (int grp = 0; grp < (int)QPalette::NColorGroups; ++grp) { for (int role = 0; role < (int)QPalette::NColorRoles; ++role) { - // random stuff + // random stuff pal1.setColor((QPalette::ColorGroup)grp, (QPalette::ColorRole)role, QColor(grp * 13, 255 - grp, role)); pal2.setColor((QPalette::ColorGroup)grp, (QPalette::ColorRole)role, @@ -2841,11 +2559,7 @@ void tst_QDataStream::status_charptr_QByteArray_data() QTest::addColumn("expectedString"); #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) -#ifdef QT3_SUPPORT - QByteArray oneMbMinus1(1024 * 1024 - 1); -#else QByteArray oneMbMinus1(1024 * 1024 - 1, '\0'); -#endif for (int i = 0; i < oneMbMinus1.size(); ++i) oneMbMinus1[i] = 0x1 | (8 * ((uchar)i / 9)); QByteArray threeMbMinus1 = oneMbMinus1 + 'j' + oneMbMinus1 + 'k' + oneMbMinus1; @@ -2933,11 +2647,7 @@ void tst_QDataStream::status_charptr_QByteArray() static QByteArray qstring2qbytearray(const QString &str) { -#ifdef QT3_SUPPORT - QByteArray ba(str.size() * 2); -#else QByteArray ba(str.size() * 2 , '\0'); -#endif for (int i = 0; i < str.size(); ++i) { // BigEndian ba[2 * i] = str[i].row(); @@ -3219,13 +2929,13 @@ void tst_QDataStream::streamToAndFromQByteArray() void tst_QDataStream::streamRealDataTypes() { - // Generate QPicture from SVG. - QSvgRenderer renderer(svgFile); - QVERIFY(renderer.isValid()); + // Generate QPicture from pixmap. + QPixmap pm(open_xpm); + QVERIFY(!pm.isNull()); QPicture picture; - picture.setBoundingRect(QRect(QPoint(0, 0), renderer.defaultSize())); + picture.setBoundingRect(QRect(QPoint(0, 0), pm.size())); QPainter painter(&picture); - renderer.render(&painter); + painter.drawPixmap(0, 0, pm); painter.end(); // Generate path @@ -3366,32 +3076,6 @@ void tst_QDataStream::streamRealDataTypes() } } -#ifdef QT3_SUPPORT -void tst_QDataStream::task_224283() -{ - static const char sdata[] = "\0\0\0\12" "123456789"; - QByteArray expected = QByteArray::fromRawData(sdata, sizeof sdata); // includes the NUL - Q3CString original = "123456789"; - - QByteArray data; - { - QDataStream out(&data, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_3_3); - out << original; - } - QCOMPARE(data, expected); - - { - QDataStream in(data); - in.setVersion(QDataStream::Qt_3_3); - Q3CString s; - in >> s; - QVERIFY(s.length() == 9); - QCOMPARE(s, original); - } -} -#endif - void tst_QDataStream::compatibility_Qt3() { QByteArray ba("hello"); diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp index 9d0c5f7d22..f5dbea49d3 100644 --- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp @@ -2701,17 +2701,10 @@ void tst_QDateTimeEdit::task98554() QCOMPARE(testWidget->time(), QTime(0, 0, 10, 0)); } -static QList makeList(int val1, int val2 = -1, int val3 = -1, int val4 = -1, int val5 = -1, int val6 = -1, int val7 = -1) +static QList makeList(int val1, int val2, int val3) { QList ret; - Q_ASSERT(val1 >= 0); - ret << val1; - if (val2 < 0) {return ret;} else {ret << val2;} - if (val3 < 0) {return ret;} else {ret << val3;} - if (val4 < 0) {return ret;} else {ret << val4;} - if (val5 < 0) {return ret;} else {ret << val5;} - if (val6 < 0) {return ret;} else {ret << val6;} - if (val7 >= 0) {ret << val2;} + ret << val1 << val2 << val3; return ret; } @@ -2753,7 +2746,7 @@ void tst_QDateTimeEdit::setCurrentSection() QFETCH(QList, setCurrentSections); QFETCH(QList, expectedCursorPositions); - Q_ASSERT(setCurrentSections.size() == expectedCursorPositions.size()); + QCOMPARE(setCurrentSections.size(), expectedCursorPositions.size()); testWidget->setDisplayFormat(format); testWidget->setDateTime(dateTime); #ifdef Q_WS_MAC diff --git a/tests/auto/qdbusmarshall/test/test.pro b/tests/auto/qdbusmarshall/test/test.pro index 71fc6563c1..ba4d99b57d 100644 --- a/tests/auto/qdbusmarshall/test/test.pro +++ b/tests/auto/qdbusmarshall/test/test.pro @@ -3,7 +3,7 @@ SOURCES += ../tst_qdbusmarshall.cpp TARGET = ../tst_qdbusmarshall QT = core -QT += dbus +QT += core-private dbus-private LIBS += $$QT_LIBS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp index bfb806b33a..142b6c22be 100644 --- a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp @@ -592,7 +592,7 @@ void tst_QDBusThreading::callbackInAnotherAuxThread() // wait for the event loop sem1.release(); sem2.acquire(); - Q_ASSERT(loop); + QVERIFY(loop); // create the second thread new Thread; diff --git a/tests/auto/qdbustype/tst_qdbustype.cpp b/tests/auto/qdbustype/tst_qdbustype.cpp index 676a9040be..2a10fe1886 100644 --- a/tests/auto/qdbustype/tst_qdbustype.cpp +++ b/tests/auto/qdbustype/tst_qdbustype.cpp @@ -185,8 +185,8 @@ void tst_QDBusType::isValidFixedType() QFETCH(QString, data); QFETCH(bool, result); QFETCH(bool, isValid); - Q_ASSERT_X(data.length() == 1, "tst_QDBusType", "Test is malformed, this function must test only one-letter types"); - Q_ASSERT(isValid || (!isValid && !result)); + QVERIFY2(data.length() == 1, "Test is malformed, this function must test only one-letter types"); + QVERIFY(isValid || (!isValid && !result)); int type = data.at(0).unicode(); if (isValid) @@ -207,8 +207,8 @@ void tst_QDBusType::isValidBasicType() QFETCH(QString, data); QFETCH(bool, result); QFETCH(bool, isValid); - Q_ASSERT_X(data.length() == 1, "tst_QDBusType", "Test is malformed, this function must test only one-letter types"); - Q_ASSERT(isValid || (!isValid && !result)); + QVERIFY2(data.length() == 1, "Test is malformed, this function must test only one-letter types"); + QVERIFY(isValid || (!isValid && !result)); int type = data.at(0).unicode(); if (isValid) diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index 8112814e35..0843633bdc 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -158,9 +158,6 @@ private slots: void operator_eq(); void dotAndDotDot(); -#ifdef QT3_SUPPORT - void matchAllDirs(); -#endif void homePath(); void tempPath(); void rootPath(); @@ -193,10 +190,6 @@ private slots: void arrayOperator(); -#ifdef QT3_SUPPORT - void setNameFilter(); -#endif - void equalityOperator_data(); void equalityOperator(); @@ -553,17 +546,6 @@ void tst_QDir::entryList_data() QTest::newRow("QDir::AllDirs | QDir::NoSymLinks") << SRCDIR "entrylist/" << QStringList("*") << int(QDir::AllDirs | QDir::NoSymLinks) << int(QDir::Name) << filterLinks(QString(".,..,directory").split(',')); -#ifdef QT3_SUPPORT - QTest::newRow("QDir::All | QDir::Hidden | QDir::System") << SRCDIR "entrylist/" << QStringList("*") - << int(QDir::All | QDir::Hidden | QDir::System) << int(QDir::Name) - << filterLinks(QString(".,..,brokenlink.lnk,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(',')); - QTest::newRow("QDir::All | QDir::Readable") << SRCDIR "entrylist/" << QStringList("*") - << int(QDir::All | QDir::Readable) << int(QDir::Name) - << filterLinks(QString(".,..,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(',')); - QTest::newRow("QDir::All | QDir::Writable") << SRCDIR "entrylist/" << QStringList("*") - << int(QDir::All | QDir::Writable) << int(QDir::Name) - << filterLinks(QString(".,..,directory,linktodirectory.lnk,writable").split(',')); -#else QTest::newRow("QDir::AllEntries | QDir::Hidden | QDir::System") << SRCDIR "entrylist/" << QStringList("*") << int(QDir::AllEntries | QDir::Hidden | QDir::System) << int(QDir::Name) << filterLinks(QString(".,..,brokenlink.lnk,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(',')); @@ -573,7 +555,6 @@ void tst_QDir::entryList_data() QTest::newRow("QDir::AllEntries | QDir::Writable") << SRCDIR "entrylist/" << QStringList("*") << int(QDir::AllEntries | QDir::Writable) << int(QDir::Name) << filterLinks(QString(".,..,directory,linktodirectory.lnk,writable").split(',')); -#endif QTest::newRow("QDir::Files | QDir::Readable") << SRCDIR "entrylist/" << QStringList("*") << int(QDir::Files | QDir::Readable) << int(QDir::Name) << filterLinks(QString("file,linktofile.lnk,writable").split(',')); @@ -993,6 +974,7 @@ void tst_QDir::cd() QDir d = startDir; bool notUsed = d.exists(); // make sure we cache this before so we can see if 'cd' fails to flush this + Q_UNUSED(notUsed); QCOMPARE(d.cd(cdDir), successExpected); if (successExpected) QCOMPARE(d.absolutePath(), newDir); @@ -1346,26 +1328,6 @@ void tst_QDir::dotAndDotDot() #endif } -#ifdef QT3_SUPPORT -/* - Tets that the setMatchAllDirs setting survies a call to setFilter. -*/ -void tst_QDir::matchAllDirs() -{ - QDir dir("/"); - dir.setMatchAllDirs(true); - dir.setNameFilters(QStringList() << "*.foo"); - dir.setFilter(QDir::Hidden); - QVERIFY(dir.matchAllDirs()); - QVERIFY(dir.entryList().count() > 0); - dir.setMatchAllDirs(false); - dir.setFilter(QDir::Hidden); - QVERIFY(dir.matchAllDirs() == false); - QCOMPARE(dir.entryList().count(), 0); - -} -#endif - void tst_QDir::homePath() { QDir homeDir = QDir::home(); @@ -1890,32 +1852,6 @@ void tst_QDir::arrayOperator() } } -#ifdef QT3_SUPPORT -void tst_QDir::setNameFilter() -{ - QStringList filters; - filters << "*.jpg" << "*.png" << "*.gif"; - QStringList filters2; - filters2 << "*.cpp" << "*.h" << "*.c"; - - QDir dir(SRCDIR "entrylist/"); - - dir.setNameFilter(filters.join(";")); - QCOMPARE(filters, dir.nameFilters()); - QCOMPARE(filters, dir.nameFilter().split(';')); - - dir.setNameFilters(filters2); - QCOMPARE(filters2, dir.nameFilter().split(';')); - - dir.setNameFilter(filters.join(" ")); - QCOMPARE(filters, dir.nameFilters()); - QCOMPARE(filters, dir.nameFilter().split(' ')); - - dir.setNameFilters(filters2); - QCOMPARE(filters2, dir.nameFilter().split(' ')); -} -#endif - void tst_QDir::equalityOperator_data() { QTest::addColumn("leftPath"); diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp index 38a6b8acdb..a6985a49ff 100644 --- a/tests/auto/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp @@ -641,10 +641,10 @@ void tst_QDirModel::filter() QDirModel model; model.setNameFilters(QStringList() << "*.nada"); QModelIndex index = model.index(SRCDIR "test"); - Q_ASSERT(model.rowCount(index) == 0); + QCOMPARE(model.rowCount(index), 0); QModelIndex index2 = model.index(SRCDIR "test/file01.tst"); - Q_ASSERT(!index2.isValid()); - Q_ASSERT(model.rowCount(index) == 0); + QVERIFY(!index2.isValid()); + QCOMPARE(model.rowCount(index), 0); } void tst_QDirModel::task244669_remove() diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 18aa84a844..f3b3e00263 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -137,7 +137,6 @@ private slots: private: static QDomDocument generateRequest(); - static QDomDocument doc(const QString &title, const QByteArray &ba); static int hasAttributesHelper( const QDomNode& node ); static bool compareDocuments( const QDomDocument &doc1, const QDomDocument &doc2 ); static bool compareNodes( const QDomNode &node1, const QDomNode &node2, bool deep ); @@ -1591,14 +1590,6 @@ void tst_QDom::reportDuplicateAttributes() const QVERIFY2(!isSuccess, "Duplicate attributes are well-formedness errors, and should be reported as such."); } -QDomDocument tst_QDom::doc(const QString &title, const QByteArray &ba) -{ - QDomDocument doc(title); - const bool ret = doc.setContent(ba, true); - Q_ASSERT(ret); - return doc; -} - void tst_QDom::namespacedAttributes() const { static const char *const xml = @@ -1611,8 +1602,13 @@ void tst_QDom::namespacedAttributes() const " >>> SIMPLE BASIC OP - SEND - DUT AS SINK\n" "\n"; - QDomDocument one = doc("document", xml); - QDomDocument two = doc("document2", one.toByteArray(2)); + QDomDocument one("document"); + QString error; + bool docParsed = one.setContent(QByteArray(xml), true, &error); + QVERIFY2(docParsed, qPrintable(error)); + QDomDocument two("document2"); + docParsed = two.setContent(one.toByteArray(2), true, &error); + QVERIFY2(docParsed, qPrintable(error)); QVERIFY(isDeepEqual(one, two)); } diff --git a/tests/auto/qfile/largefile/tst_largefile.cpp b/tests/auto/qfile/largefile/tst_largefile.cpp index a9ad017e14..8070ad27df 100644 --- a/tests/auto/qfile/largefile/tst_largefile.cpp +++ b/tests/auto/qfile/largefile/tst_largefile.cpp @@ -160,13 +160,10 @@ static inline void appendRaw(QByteArray &array, T data) */ static inline void topUpWith(QByteArray &array, QByteArray filler, int size) { - Q_ASSERT(filler.size() > 0); - for (int i = (size - array.size()) / filler.size(); i > 0; --i) array.append(filler); if (array.size() < size) { - Q_ASSERT(size - array.size() < filler.size()); array.append(filler.left(size - array.size())); } } @@ -206,15 +203,12 @@ static inline QByteArray generateDataBlock(int blockSize, QString text, qint64 u QByteArray filler("0123456789"); block.append(filler.right(10 - block.size() % 10)); - topUpWith(block, filler, blockSize - 2 * sizeof(qint64)); + topUpWith(block, filler, blockSize - 3 * sizeof(qint64)); appendRaw(block, counter); appendRaw(block, userBits); appendRaw(block, randomBits); - Q_ASSERT( block.size() >= blockSize ); - block.resize(blockSize); - ++counter; return block; } diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp index 688a92d04b..a0db699c42 100644 --- a/tests/auto/qfile/tst_qfile.cpp +++ b/tests/auto/qfile/tst_qfile.cpp @@ -333,6 +333,8 @@ private: case OpenRFile: return openRFile(file, mode, handleFlags); #endif + case NumberOfFileTypes: + break; } return false; diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/qfiledialog/qfiledialog.pro index 68f2e3c146..57828b1bd4 100644 --- a/tests/auto/qfiledialog/qfiledialog.pro +++ b/tests/auto/qfiledialog/qfiledialog.pro @@ -4,6 +4,7 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qfiledialog.cpp wince*|symbian { diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp index 5e9f1306c4..dc3ca5285d 100644 --- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp @@ -812,7 +812,7 @@ void tst_QFileDialog2::task239706_editableFilterCombo() break; } } - Q_ASSERT(filterCombo); + QVERIFY(filterCombo); filterCombo->setEditable(true); QTest::mouseClick(filterCombo, Qt::LeftButton); QTest::keyPress(filterCombo, Qt::Key_X); diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index 6f01f6705f..2fd626a57e 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qfileinfo.cpp -QT = core +QT = core-private RESOURCES += qfileinfo.qrc diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 7d628f50a0..1d0afccbd0 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -42,7 +42,6 @@ #include - #include #include #include @@ -726,15 +725,9 @@ void tst_QFileInfo::dir() if (absPath) { QCOMPARE(fi.absolutePath(), expected); QCOMPARE(fi.absoluteDir().path(), expected); -#ifdef QT3_SUPPORT - QCOMPARE(fi.dir(true).path(), expected); -#endif } else { QCOMPARE(fi.path(), expected); QCOMPARE(fi.dir().path(), expected); -#ifdef QT3_SUPPORT - QCOMPARE(fi.dir(false).path(), expected); -#endif } } diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro index 04cea4805c..ab121306e3 100644 --- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro @@ -1,6 +1,6 @@ CONFIG += qttest_p4 -QT = core gui +QT = core-private gui SOURCES += tst_qfilesystemmodel.cpp TARGET = tst_qfilesystemmodel diff --git a/tests/auto/qfocusevent/tst_qfocusevent.cpp b/tests/auto/qfocusevent/tst_qfocusevent.cpp index 401f4a7075..e79153412a 100644 --- a/tests/auto/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/qfocusevent/tst_qfocusevent.cpp @@ -43,13 +43,7 @@ #include #include #include - -#if defined (QT3_SUPPORT) -#include -#else #include -#endif - #include #include #include @@ -264,32 +258,6 @@ void tst_QFocusEvent::checkReason_Popup() initWidget(); // Now test the popup reason -#if defined (QT3_SUPPORT) - Q3PopupMenu* popupMenu = new Q3PopupMenu( testFocusWidget ); - popupMenu->insertItem( "Test" ); - popupMenu->popup( QPoint(0,0) ); - QTest::qWait(50); - - QTRY_VERIFY(childFocusWidgetOne->focusOutEventLostFocus); - - QVERIFY( childFocusWidgetOne->hasFocus() ); - QVERIFY( !childFocusWidgetOne->focusInEventRecieved ); - QVERIFY( childFocusWidgetOne->focusOutEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusInEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved ); - QCOMPARE( childFocusWidgetOne->focusOutEventReason, int(Qt::PopupFocusReason)); - - popupMenu->hide(); - - QVERIFY(childFocusWidgetOne->focusInEventRecieved); - QVERIFY(childFocusWidgetOne->focusInEventGotFocus); - - QVERIFY( childFocusWidgetOne->hasFocus() ); - QVERIFY( childFocusWidgetOne->focusInEventRecieved ); - QVERIFY( childFocusWidgetOne->focusOutEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusInEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved ); -#else QMenu* popupMenu = new QMenu( testFocusWidget ); popupMenu->addMenu( "Test" ); popupMenu->popup( QPoint(0,0) ); @@ -314,7 +282,6 @@ void tst_QFocusEvent::checkReason_Popup() QVERIFY( childFocusWidgetOne->focusOutEventRecieved ); QVERIFY( !childFocusWidgetTwo->focusInEventRecieved ); QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved ); -#endif } #ifdef Q_WS_MAC diff --git a/tests/auto/qfuture/tst_qfuture.cpp b/tests/auto/qfuture/tst_qfuture.cpp index 8afdf48fc3..26d96f0f81 100644 --- a/tests/auto/qfuture/tst_qfuture.cpp +++ b/tests/auto/qfuture/tst_qfuture.cpp @@ -1453,6 +1453,7 @@ void tst_QFuture::exceptions_QTBUG18149() try { MyClass m; + Q_UNUSED(m); throw 0; } catch (int) {} diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro index 20f8018f4c..74d9803d2f 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/qgl/qgl.pro @@ -4,7 +4,7 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) -QT += opengl +QT += opengl-private gui-private core-private contains(QT_CONFIG,egl):DEFINES += QGL_EGL win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index 87684258ed..e1829b0b6b 100644 --- a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsanchorlayout.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 447385a7d8..55d6fc97cd 100644 --- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -132,33 +132,32 @@ static void setAnchor(QGraphicsAnchorLayout *l, anchor->setSpacing(spacing); } -static bool checkReverseDirection(QGraphicsWidget *w) +static bool checkReverseDirection(QGraphicsWidget *widget) { - QGraphicsLayout *l = w->layout(); - Q_ASSERT(l); + QGraphicsLayout *layout = widget->layout(); qreal left, top, right, bottom; - l->getContentsMargins(&left, &top, &right, &bottom); - w->setLayoutDirection(Qt::LeftToRight); + layout->getContentsMargins(&left, &top, &right, &bottom); + widget->setLayoutDirection(Qt::LeftToRight); QApplication::processEvents(); - const QRectF lg = l->geometry(); + const QRectF layoutGeometry = layout->geometry(); QMap geometries; - for (int i = 0; i < l->count(); ++i) { - QGraphicsLayoutItem *w = l->itemAt(i); - geometries.insert(w, w->geometry()); + for (int i = 0; i < layout->count(); ++i) { + QGraphicsLayoutItem *item = layout->itemAt(i); + geometries.insert(item, item->geometry()); } - w->setLayoutDirection(Qt::RightToLeft); + widget->setLayoutDirection(Qt::RightToLeft); QApplication::processEvents(); - lg.adjusted(+right, +top, -left, -bottom); - for (int i = 0; i < l->count(); ++i) { - QGraphicsLayoutItem *w = l->itemAt(i); - const QRectF rtlGeom = w->geometry(); - const QRectF ltrGeom = geometries.value(w); - QRectF expectedGeom = ltrGeom; - expectedGeom.moveRight(lg.right() - (0 + ltrGeom.left())); - if (expectedGeom != rtlGeom) { - qDebug() << "layout->geometry():" << lg - << "expected:" << expectedGeom - << "actual:" << rtlGeom; + layoutGeometry.adjusted(+right, +top, -left, -bottom); + for (int i = 0; i < layout->count(); ++i) { + QGraphicsLayoutItem *item = layout->itemAt(i); + const QRectF rightToLeftGeometry = item->geometry(); + const QRectF leftToRightGeometry = geometries.value(item); + QRectF expectedGeometry = leftToRightGeometry; + expectedGeometry.moveRight(layoutGeometry.right() - leftToRightGeometry.left()); + if (expectedGeometry != rightToLeftGeometry) { + qDebug() << "layout->geometry():" << layoutGeometry + << "expected:" << expectedGeometry + << "actual:" << rightToLeftGeometry; return false; } } @@ -345,6 +344,7 @@ void tst_QGraphicsAnchorLayout::layoutDirection() p->show(); view->show(); + QVERIFY(p->layout()); QCOMPARE(checkReverseDirection(p), true); if (hasSimplification) { @@ -445,6 +445,7 @@ void tst_QGraphicsAnchorLayout::diagonal() QVERIFY(!usedSimplex(l, Qt::Vertical)); } + QVERIFY(p.layout()); QCOMPARE(checkReverseDirection(&p), true); c->setMinimumWidth(300); @@ -735,6 +736,7 @@ void tst_QGraphicsAnchorLayout::snakeOppositeDirections() QCOMPARE(c->geometry(), QRectF(90.0, 200.0, 100.0, 100.0)); QCOMPARE(p.size(), layoutMaximumSize); + QVERIFY(p.layout()); QCOMPARE(checkReverseDirection(&p), true); } diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro index 90b78783d9..535de0c07e 100644 --- a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro +++ b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsanchorlayout1.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp index a03f7bca6d..ee25291160 100644 --- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp +++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp @@ -2585,15 +2585,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 30 ); sizeHints1.insert( Qt::PreferredSize, 35 ); sizeHints1.insert( Qt::MaximumSize, 40 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 5 ); sizeHints2.insert( Qt::PreferredSize, 35 ); sizeHints2.insert( Qt::MaximumSize, 300 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 35; const qreal width2 = 100-10-10-10-width1; @@ -2605,15 +2601,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 0 ); sizeHints1.insert( Qt::PreferredSize, 20 ); sizeHints1.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 0 ); sizeHints2.insert( Qt::PreferredSize, 50 ); sizeHints2.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 20; const qreal width2 = 100-10-10-10-width1; @@ -2625,15 +2617,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 0 ); sizeHints1.insert( Qt::PreferredSize, 40 ); sizeHints1.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 0 ); sizeHints2.insert( Qt::PreferredSize, 60 ); sizeHints2.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 28; // got from manual calculation const qreal width2 = 100-10-10-10-width1; @@ -2645,15 +2633,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 0 ); sizeHints1.insert( Qt::PreferredSize, 10 ); sizeHints1.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 0 ); sizeHints2.insert( Qt::PreferredSize, 40 ); sizeHints2.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 22; // got from manual calculation const qreal width2 = 100-10-10-10-width1; @@ -2669,6 +2653,12 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution() QFETCH(qreal, width1); QFETCH(qreal, width2); + // sanity-check the test data - MinimumSize <= PreferredSize <= MaximumSize + QVERIFY( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); + QVERIFY( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); + QVERIFY( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); + QVERIFY( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); + // create objects QGraphicsWidget widget; TheAnchorLayout *layout = new TheAnchorLayout; diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 837df783a3..78010e6071 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -3018,39 +3018,6 @@ static QSizeF wfh(Qt::SizeHint /*which*/, const QSizeF &constraint) return result; } -static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired) -{ - Q_ASSERT(sumDesired != 0.0); - return desired * qPow(sumAvailable / sumDesired, desired / sumDesired); -} - -static void expectedWidth(qreal minSize1, qreal prefSize1, - qreal minSize2, qreal prefSize2, - qreal targetSize, qreal *width1, qreal *width2) -{ - qreal sumAvail,factor1,factor2; - // stretch behaviour is different below and above preferred size... - if (targetSize < prefSize1 + prefSize2) { - sumAvail = targetSize - minSize1 - minSize2; - const qreal desired1 = prefSize1 - minSize1; - const qreal desired2 = prefSize2 - minSize2; - const qreal sumDesired = desired1 + desired2; - factor1 = growthFactorBelowPreferredSize(desired1, sumAvail, sumDesired); - factor2 = growthFactorBelowPreferredSize(desired2, sumAvail, sumDesired); - const qreal sumFactors = factor1 + factor2; - *width1 = sumAvail*factor1/sumFactors + minSize1; - *width2 = sumAvail*factor2/sumFactors + minSize2; - } else { - sumAvail = targetSize - prefSize1 - prefSize2; - factor1 = prefSize1; - factor2 = prefSize2; - const qreal sumFactors = factor1 + factor2; - *width1 = sumAvail*factor1/sumFactors + prefSize1; - *width2 = sumAvail*factor2/sumFactors + prefSize2; - } -} - - bool qFuzzyCompare(const QSizeF &a, const QSizeF &b) { return qFuzzyCompare(a.width(), b.width()) && qFuzzyCompare(a.height(), b.height()); diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro index 20acf35b33..ed30cae759 100644 --- a/tests/auto/qgraphicsitem/qgraphicsitem.pro +++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsitem.cpp DEFINES += QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 73e5656b15..b55130965a 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -110,7 +110,7 @@ static void sendMousePress(QGraphicsScene *scene, const QPointF &point, Qt::Mous } static void sendMouseMove(QGraphicsScene *scene, const QPointF &point, - Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons buttons = 0) + Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons /* buttons */ = 0) { QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMouseMove); event.setScenePos(point); @@ -794,6 +794,7 @@ void tst_QGraphicsItem::deleteChildItem() QGraphicsItem *child1 = new QGraphicsRectItem(rect); QGraphicsItem *child2 = new QGraphicsRectItem(rect); QGraphicsItem *child3 = new QGraphicsRectItem(rect); + Q_UNUSED(child3); delete child1; child2->setParentItem(0); delete child2; @@ -10732,7 +10733,7 @@ void tst_QGraphicsItem::deviceCoordinateCache_simpleRotations() QTRY_VERIFY(view.repaints > 0); QGraphicsItemCache *itemCache = QGraphicsItemPrivate::get(item)->extraItemCache(); - Q_ASSERT(itemCache); + QVERIFY(itemCache); QPixmapCache::Key currentKey = itemCache->deviceData.value(view.viewport()).key; // Trigger an update and verify that the cache is unchanged. diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp index 29ea07460e..6f08a5dad1 100644 --- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp @@ -644,7 +644,7 @@ void AnimatedLayoutItem::setGeometry(const QRectF &geom) QGraphicsLayoutItem::setGeometry(geom); } -QSizeF AnimatedLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF AnimatedLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const { switch (which) { case Qt::MinimumSize: @@ -760,7 +760,7 @@ private: QSet *m_destructedSet; }; -QSizeF CustomLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF CustomLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const { switch (which) { case Qt::MinimumSize: @@ -800,7 +800,7 @@ private: QSet *m_destructedSet; }; -QSizeF CustomGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF CustomGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const { switch (which) { case Qt::MinimumSize: @@ -889,7 +889,7 @@ void updateParentWidget(QGraphicsWidget *item) } } -QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF sizeHint(Qt::SizeHint /* which */, const QSizeF & /* constraint */) const { return QSizeF(50,50); } diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 8f8ac67d09..b3e4a88edf 100644 --- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -299,7 +299,7 @@ void tst_QGraphicsLinearLayout::alignment() int i; bool addWidget = true; - for (i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) { + for (size_t i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) { QGraphicsLayoutItem *loutItem; Qt::Alignment align = alignmentsToTest[i]; if (!align && i > 0) @@ -1139,6 +1139,7 @@ void tst_QGraphicsLinearLayout::testStretch() { QGraphicsScene scene; QGraphicsView *view = new QGraphicsView(&scene); + Q_UNUSED(view); QGraphicsWidget *form = new QGraphicsWidget(0, Qt::Window); scene.addItem(form); diff --git a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp index 5619766a71..93af2e0443 100644 --- a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp +++ b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp @@ -284,6 +284,7 @@ void tst_QGraphicsObject::deleted() bool item2_wasDeleted = false; DeleteTester *item1 = new DeleteTester(&item1_wasDeleted, &item1_parentWasDeleted); DeleteTester *item2 = new DeleteTester(&item2_wasDeleted, &item2_parentWasDeleted, item1); + Q_UNUSED(item2); delete item1; QVERIFY(!item1_wasDeleted); // destructor not called yet diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro index 82fa423e66..635fb9b4e6 100644 --- a/tests/auto/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsscene.cpp RESOURCES += images.qrc win32:!wince*: LIBS += -lUser32 diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index 9ff086c425..09275774ce 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -3594,7 +3594,7 @@ void tst_QGraphicsScene::task160653_selectionChanged() item->flags() | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable); item->setSelected(true); } - Q_ASSERT(scene.items().size() > 1); + QVERIFY(scene.items().size() > 1); QCOMPARE(scene.items().size(), scene.selectedItems().size()); QSignalSpy spy(&scene, SIGNAL(selectionChanged())); diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro index 1fdd176b3b..0d0fd0db1a 100644 --- a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro +++ b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro @@ -1,4 +1,5 @@ load(qttest_p4) requires(contains(QT_CONFIG,private_tests)) +QT += core-private gui-private SOURCES += tst_qgraphicssceneindex.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index 80629c54cf..fe949742cd 100644 --- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -290,7 +290,7 @@ public: { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */) { painter->setBrush(brush); painter->drawRect(boundingRect()); @@ -348,7 +348,7 @@ void tst_QGraphicsSceneIndex::clear() int numPaints; protected: QRectF boundingRect() const { return QRectF(0, 0, 10, 10); } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) + void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *, QWidget *) { ++numPaints; } }; diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index ca6b4d285e..2d02ec052f 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -4009,7 +4009,7 @@ public: m_viewHasIMEnabledInFocusInEvent = false; } - void focusInEvent(QFocusEvent *event) + void focusInEvent(QFocusEvent * /* event */) { QGraphicsView *view = scene()->views().first(); m_viewHasIMEnabledInFocusInEvent = view->testAttribute(Qt::WA_InputMethodEnabled); @@ -4403,7 +4403,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect() { public: CustomScene(const QRectF &rect) : QGraphicsScene(rect) { } - void drawBackground(QPainter *painter, const QRectF &rect) + void drawBackground(QPainter * /* painter */, const QRectF &rect) { lastBackgroundExposedRect = rect; } QRectF lastBackgroundExposedRect; }; @@ -4413,7 +4413,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect() public: CustomRectItem(const QRectF &rect) : QGraphicsRectItem(rect) { setFlag(QGraphicsItem::ItemUsesExtendedStyleOption); } - void paint(QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) + void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *option, QWidget * /* widget */ = 0) { lastExposedRect = option->exposedRect; } QRectF lastExposedRect; }; @@ -4528,7 +4528,7 @@ public: setFlag(QGraphicsItem::ItemAcceptsInputMethod, true); } - QVariant inputMethodQuery(Qt::InputMethodQuery query) const + QVariant inputMethodQuery(Qt::InputMethodQuery) const { return mf; } diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp index 9a25fb6bbc..d877d2f16e 100644 --- a/tests/auto/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/qheaderview/tst_qheaderview.cpp @@ -1106,7 +1106,7 @@ void tst_QHeaderView::moveAndInsertSection() void tst_QHeaderView::resizeMode() { - // Q_ASSERT's when resizeMode is called with an invalid index + // resizeMode must not be called with an invalid index int last = view->count() - 1; view->setResizeMode(QHeaderView::Interactive); QCOMPARE(view->resizeMode(last), QHeaderView::Interactive); diff --git a/tests/auto/qhostaddress/tst_qhostaddress.cpp b/tests/auto/qhostaddress/tst_qhostaddress.cpp index bd020aa015..e2043a5012 100644 --- a/tests/auto/qhostaddress/tst_qhostaddress.cpp +++ b/tests/auto/qhostaddress/tst_qhostaddress.cpp @@ -164,21 +164,27 @@ void tst_QHostAddress::setAddress_QString_data() QTest::newRow("ip4_04") << QString("255.3.2.1\r ") << (bool)TRUE << QString("255.3.2.1") << 4; QTest::newRow("ip4_05") << QString("0.0.0.0") << (bool)TRUE << QString("0.0.0.0") << 4; - // for the format of IPv6 addresses see also RFC 1884 + // for the format of IPv6 addresses see also RFC 5952 QTest::newRow("ip6_00") << QString("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210") << (bool)TRUE << QString("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210") << 6; - QTest::newRow("ip6_01") << QString("1080:0000:0000:0000:0008:0800:200C:417A") << (bool)TRUE << QString("1080:0:0:0:8:800:200C:417A") << 6; - QTest::newRow("ip6_02") << QString("1080:0:0:0:8:800:200C:417A") << (bool)TRUE << QString("1080:0:0:0:8:800:200C:417A") << 6; - QTest::newRow("ip6_03") << QString("1080::8:800:200C:417A") << (bool)TRUE << QString("1080:0:0:0:8:800:200C:417A") << 6; - QTest::newRow("ip6_04") << QString("FF01::43") << (bool)TRUE << QString("FF01:0:0:0:0:0:0:43") << 6; - QTest::newRow("ip6_05") << QString("::1") << (bool)TRUE << QString("0:0:0:0:0:0:0:1") << 6; - QTest::newRow("ip6_06") << QString("1::") << (bool)TRUE << QString("1:0:0:0:0:0:0:0") << 6; - QTest::newRow("ip6_07") << QString("::") << (bool)TRUE << QString("0:0:0:0:0:0:0:0") << 6; - QTest::newRow("ip6_08") << QString("0:0:0:0:0:0:13.1.68.3") << (bool)TRUE << QString("0:0:0:0:0:0:D01:4403") << 6; - QTest::newRow("ip6_09") << QString("::13.1.68.3") << (bool)TRUE << QString("0:0:0:0:0:0:D01:4403") << 6; - QTest::newRow("ip6_10") << QString("0:0:0:0:0:FFFF:129.144.52.38") << (bool)TRUE << QString("0:0:0:0:0:FFFF:8190:3426") << 6; - QTest::newRow("ip6_11") << QString("::FFFF:129.144.52.38") << (bool)TRUE << QString("0:0:0:0:0:FFFF:8190:3426") << 6; - QTest::newRow("ip6_12") << QString("1::FFFF:129.144.52.38") << (bool)TRUE << QString("1:0:0:0:0:FFFF:8190:3426") << 6; - QTest::newRow("ip6_13") << QString("A:B::D:E") << (bool)TRUE << QString("A:B:0:0:0:0:D:E") << 6; + QTest::newRow("ip6_01") << QString("1080:0000:0000:0000:0008:0800:200C:417A") << (bool)TRUE << QString("1080::8:800:200C:417A") << 6; + QTest::newRow("ip6_02") << QString("1080:0:0:0:8:800:200C:417A") << (bool)TRUE << QString("1080::8:800:200C:417A") << 6; + QTest::newRow("ip6_03") << QString("1080::8:800:200C:417A") << (bool)TRUE << QString("1080::8:800:200C:417A") << 6; + QTest::newRow("ip6_04") << QString("FF01::43") << (bool)TRUE << QString("FF01::43") << 6; + QTest::newRow("ip6_05") << QString("::1") << (bool)TRUE << QString("::1") << 6; + QTest::newRow("ip6_06") << QString("1::") << (bool)TRUE << QString("1::") << 6; + QTest::newRow("ip6_07") << QString("::") << (bool)TRUE << QString("::") << 6; + QTest::newRow("ip6_08") << QString("0:0:0:0:0:0:13.1.68.3") << (bool)TRUE << QString("::D01:4403") << 6; + QTest::newRow("ip6_09") << QString("::13.1.68.3") << (bool)TRUE << QString("::D01:4403") << 6; + QTest::newRow("ip6_10") << QString("0:0:0:0:0:FFFF:129.144.52.38") << (bool)TRUE << QString("::FFFF:8190:3426") << 6; + QTest::newRow("ip6_11") << QString("::FFFF:129.144.52.38") << (bool)TRUE << QString("::FFFF:8190:3426") << 6; + QTest::newRow("ip6_12") << QString("1::FFFF:129.144.52.38") << (bool)TRUE << QString("1::FFFF:8190:3426") << 6; + QTest::newRow("ip6_13") << QString("A:B::D:E") << (bool)TRUE << QString("A:B::D:E") << 6; + QTest::newRow("ip6_14") << QString("1080:0:1:0:8:800:200C:417A") << (bool)TRUE << QString("1080:0:1:0:8:800:200C:417A") << 6; + QTest::newRow("ip6_15") << QString("1080:0:1:0:8:800:200C:0") << (bool)TRUE << QString("1080:0:1:0:8:800:200C:0") << 6; + QTest::newRow("ip6_16") << QString("1080:0:1:0:8:800:0:0") << (bool)TRUE << QString("1080:0:1:0:8:800::") << 6; + QTest::newRow("ip6_17") << QString("1080:0:0:0:8:800:0:0") << (bool)TRUE << QString("1080::8:800:0:0") << 6; + QTest::newRow("ip6_18") << QString("0:1:1:1:8:800:0:0") << (bool)TRUE << QString("0:1:1:1:8:800::") << 6; + QTest::newRow("ip6_19") << QString("0:1:1:1:8:800:0:1") << (bool)TRUE << QString("0:1:1:1:8:800:0:1") << 6; QTest::newRow("error_00") << QString("foobarcom") << (bool)FALSE << QString() << 0; QTest::newRow("error_01") << QString("foo.bar.com") << (bool)FALSE << QString() << 0; @@ -329,16 +335,16 @@ void tst_QHostAddress::scopeId() { QHostAddress address("fe80::2e0:4cff:fefb:662a%eth0"); QCOMPARE(address.scopeId(), QString("eth0")); - QCOMPARE(address.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%eth0")); + QCOMPARE(address.toString().toLower(), QString("fe80::2e0:4cff:fefb:662a%eth0")); QHostAddress address2("fe80::2e0:4cff:fefb:662a"); QCOMPARE(address2.scopeId(), QString()); address2.setScopeId(QString("en0")); - QCOMPARE(address2.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%en0")); + QCOMPARE(address2.toString().toLower(), QString("fe80::2e0:4cff:fefb:662a%en0")); address2 = address; QCOMPARE(address2.scopeId(), QString("eth0")); - QCOMPARE(address2.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%eth0")); + QCOMPARE(address2.toString().toLower(), QString("fe80::2e0:4cff:fefb:662a%eth0")); } void tst_QHostAddress::hashKey() diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/qhostinfo/qhostinfo.pro index 97197a9b95..77ce1867d1 100644 --- a/tests/auto/qhostinfo/qhostinfo.pro +++ b/tests/auto/qhostinfo/qhostinfo.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qhostinfo.cpp -QT = core network +QT = core-private network-private wince*: { LIBS += ws2.lib diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index af0631e1f5..7657035a37 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -213,6 +213,13 @@ void tst_QHostInfo::initTestCase() #else ipv6Available = false; ipv6LookupsAvailable = false; + + QTcpServer server; + if (server.listen(QHostAddress("::1"))) { + // We have IPv6 support + ipv6Available = true; + } + #if !defined(QT_NO_GETADDRINFO) // check if the system getaddrinfo can do IPv6 lookups struct addrinfo hint, *result = 0; @@ -235,13 +242,6 @@ void tst_QHostInfo::initTestCase() #endif #endif - QTcpServer server; - if (server.listen(QHostAddress("::1"))) { - // We have IPv6 support - ipv6Available = true; - } - - // run each testcase with and without test enabled QTest::addColumn("cache"); QTest::newRow("WithCache") << true; diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index 61123c297f..96346cc91a 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -772,6 +772,7 @@ void tst_QHttp::authorization() http.setUser(user, pass); http.setHost(host); int id = http.get(path); + Q_UNUSED(id); QTimer::singleShot(5000, &loop, SLOT(quit())); loop.exec(); diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro index 223c4e1c96..98511ac86e 100644 --- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -3,7 +3,7 @@ SOURCES += tst_qhttpnetworkconnection.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) -QT = core network +QT = core-private network-private symbian: TARGET.CAPABILITY = NetworkServices symbian: { diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index ba1f8c8cca..ea4fddcc5e 100644 --- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -1000,6 +1000,7 @@ public: public Q_SLOTS: void finishedSlot() { QHttpNetworkReply *reply = (QHttpNetworkReply*) sender(); + Q_UNUSED(reply); receivedCount++; if (receivedCount == requestCount) @@ -1046,6 +1047,7 @@ public: public Q_SLOTS: void finishedSlot() { QHttpNetworkReply *reply = (QHttpNetworkReply*) sender(); + Q_UNUSED(reply); receivedCount++; if (receivedCount == requestCount) diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro index 36d56c6f20..8ce9f6f760 100644 --- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro +++ b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro @@ -3,5 +3,5 @@ SOURCES += tst_qhttpnetworkreply.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) -QT = core network +QT = core-private network-private symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro index 6df619200b..f26abbe8d9 100644 --- a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro @@ -6,7 +6,7 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core network +QT = core-private network-private symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index ad85bf5cce..49acb98a6a 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -73,7 +73,6 @@ private slots: void create(); void createInvalidXPM(); void createFromUChar(); - void convertBitOrder(); void formatHandlersInput_data(); void formatHandlersInput(); @@ -265,32 +264,6 @@ void tst_QImage::createFromUChar() QCOMPARE(i4.pixel(0,0), 6U); } -void tst_QImage::convertBitOrder() -{ -#if !defined(QT3_SUPPORT) - QSKIP("Qt compiled without Qt3Support", SkipAll); -#else - QImage i(9,5,1,2,QImage::LittleEndian); - qMemSet(i.bits(), 0, i.byteCount()); - - i.setDotsPerMeterX(9); - i.setDotsPerMeterY(5); - i.fill(0x12345678); - QVERIFY(!i.isNull()); - - QImage ni = i.convertBitOrder(QImage::BigEndian); - QVERIFY(!ni.isNull()); - QVERIFY(ni.bitOrder() == QImage::BigEndian); - - // A bunch of verifies to make sure that nothing was lost - QVERIFY(i.dotsPerMeterX() == ni.dotsPerMeterX()); - QVERIFY(i.dotsPerMeterY() == ni.dotsPerMeterY()); - QVERIFY(i.depth() == ni.depth()); - QVERIFY(i.size() == ni.size()); - QVERIFY(i.colorCount() == ni.colorCount()); -#endif -} - void tst_QImage::formatHandlersInput_data() { QTest::addColumn("testFormat"); diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/qinputdialog/tst_qinputdialog.cpp index 1d13eb6292..e0317df382 100644 --- a/tests/auto/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/qinputdialog/tst_qinputdialog.cpp @@ -193,12 +193,12 @@ void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0) void testGetText(QInputDialog *dialog) { QLineEdit *ledit = qFindChild(dialog); - Q_ASSERT(ledit); + QVERIFY(ledit); QDialogButtonBox *bbox = qFindChild(dialog); - Q_ASSERT(bbox); + QVERIFY(bbox); QPushButton *okButton = bbox->button(QDialogButtonBox::Ok); - Q_ASSERT(okButton); + QVERIFY(okButton); QVERIFY(ledit->hasAcceptableInput()); QCOMPARE(ledit->selectedText(), ledit->text()); @@ -211,12 +211,12 @@ void testGetText(QInputDialog *dialog) void testGetItem(QInputDialog *dialog) { QComboBox *cbox = qFindChild(dialog); - Q_ASSERT(cbox); + QVERIFY(cbox); QDialogButtonBox *bbox = qFindChild(dialog); - Q_ASSERT(bbox); + QVERIFY(bbox); QPushButton *okButton = bbox->button(QDialogButtonBox::Ok); - Q_ASSERT(okButton); + QVERIFY(okButton); QVERIFY(okButton->isEnabled()); const int origIndex = cbox->currentIndex(); @@ -249,7 +249,7 @@ void tst_QInputDialog::timerEvent(QTimerEvent *event) { killTimer(event->timerId()); QInputDialog *dialog = qFindChild(parent); - Q_ASSERT(dialog); + QVERIFY(dialog); if (testFunc) testFunc(dialog); dialog->done(doneCode); // cause static function call to return @@ -270,7 +270,7 @@ void tst_QInputDialog::getInteger() { QFETCH(int, min); QFETCH(int, max); - Q_ASSERT(min < max); + QVERIFY(min < max); parent = new QWidget; doneCode = QDialog::Accepted; testFunc = &tst_QInputDialog::testFuncGetInteger; @@ -310,7 +310,7 @@ void tst_QInputDialog::getDouble() QFETCH(double, min); QFETCH(double, max); QFETCH(int, decimals); - Q_ASSERT(min < max && decimals >= 0 && decimals <= 13); + QVERIFY(min < max && decimals >= 0 && decimals <= 13); parent = new QWidget; doneCode = QDialog::Accepted; testFunc = &tst_QInputDialog::testFuncGetDouble; diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp index 50abffe1f0..804d0502f4 100644 --- a/tests/auto/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/qiodevice/tst_qiodevice.cpp @@ -73,8 +73,6 @@ private slots: void unget(); void peek(); void peekAndRead(); - void getch(); - void putch(); void readLine_data(); void readLine(); @@ -382,47 +380,6 @@ void tst_QIODevice::peekAndRead() QFile::remove("peektestfile"); } -void tst_QIODevice::getch() -{ -#ifdef QT3_SUPPORT - QBuffer buffer; - buffer.open(QBuffer::ReadWrite); - buffer.write("\xff\x7f\x80\x00", 4); - buffer.reset(); - QCOMPARE(buffer.getch(), 0xff); - QCOMPARE(buffer.getch(), 0x7f); - QCOMPARE(buffer.getch(), 0x80); - QCOMPARE(buffer.getch(), 0x00); - - buffer.ungetch(0x00); - buffer.ungetch(0x80); - buffer.ungetch(0x7f); - buffer.ungetch(0xff); - - QCOMPARE(buffer.getch(), 0xff); - QCOMPARE(buffer.getch(), 0x7f); - QCOMPARE(buffer.getch(), 0x80); - QCOMPARE(buffer.getch(), 0x00); -#endif -} - -void tst_QIODevice::putch() -{ -#ifdef QT3_SUPPORT - QBuffer buffer; - buffer.open(QBuffer::ReadWrite); - buffer.putch(0xff); - buffer.putch(0x7f); - buffer.putch(0x80); - buffer.putch(0x00); - buffer.reset(); - QCOMPARE(buffer.getch(), 0xff); - QCOMPARE(buffer.getch(), 0x7f); - QCOMPARE(buffer.getch(), 0x80); - QCOMPARE(buffer.getch(), 0x00); -#endif -} - void tst_QIODevice::readLine_data() { QTest::addColumn("data"); @@ -613,7 +570,7 @@ public: } return maxlen; } - qint64 writeData(const char *data, qint64 maxlen) { + qint64 writeData(const char * /* data */, qint64 /* maxlen */) { return -1; } diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/qitemmodel/modelstotest.cpp index c4c2cbb521..df06c95254 100644 --- a/tests/auto/qitemmodel/modelstotest.cpp +++ b/tests/auto/qitemmodel/modelstotest.cpp @@ -227,7 +227,6 @@ QAbstractItemModel *ModelsToTest::createModel(const QString &modelType) return widget->model(); } - Q_ASSERT(false); return 0; } @@ -309,15 +308,23 @@ QModelIndex ModelsToTest::populateTestArea(QAbstractItemModel *model) */ } QModelIndex returnIndex = model->index(0,0); - Q_ASSERT(returnIndex.isValid()); + if (!returnIndex.isValid()) + qFatal("%s: model index to be returned is invalid", Q_FUNC_INFO); return returnIndex; } if (QDirModel *dirModel = qobject_cast(model)) { - // Don't risk somthing bad happening, assert if this fails - Q_ASSERT(QDir(QDir::currentPath()).mkdir("test")); - for (int i = 0; i < 26; ++i) - Q_ASSERT(QDir(QDir::currentPath()).mkdir(QString("test/foo_%1").arg(i))); + if (!QDir::current().mkdir("test")) + qFatal("%s: cannot create directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test"))); + for (int i = 0; i < 26; ++i) { + QString subdir = QString("test/foo_%1").arg(i); + if (!QDir::current().mkdir(subdir)) + qFatal("%s: cannot create directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir))); + } return dirModel->index(QDir::currentPath()+"/test"); } @@ -373,7 +380,7 @@ QModelIndex ModelsToTest::populateTestArea(QAbstractItemModel *model) return QModelIndex(); } - Q_ASSERT(false); + qFatal("%s: unknown type of model", Q_FUNC_INFO); return QModelIndex(); } @@ -387,9 +394,17 @@ void ModelsToTest::cleanupTestArea(QAbstractItemModel *model) { if (QDir(QDir::currentPath()+"/test").exists()) { - for (int i = 0; i < 26; ++i) - QDir::current().rmdir(QString("test/foo_%1").arg(i)); - Q_ASSERT(QDir::current().rmdir("test")); + for (int i = 0; i < 26; ++i) { + QString subdir(QString("test/foo_%1").arg(i)); + if (!QDir::current().rmdir(subdir)) + qFatal("%s: cannot remove directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir))); + } + if (!QDir::current().rmdir("test")) + qFatal("%s: cannot remove directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test"))); } } else if (qobject_cast(model)) { QSqlQuery q("DROP TABLE test"); diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp index 7e177bae9b..948285386f 100644 --- a/tests/auto/qitemmodel/tst_qitemmodel.cpp +++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp @@ -199,6 +199,7 @@ void tst_QItemModel::nonDestructiveBasicTest() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QCOMPARE(currentModel->buddy(QModelIndex()), QModelIndex()); currentModel->canFetchMore(QModelIndex()); @@ -244,6 +245,7 @@ void tst_QItemModel::rowCount() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, isEmpty); if (isEmpty) { @@ -291,6 +293,7 @@ void tst_QItemModel::columnCount() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, isEmpty); if (isEmpty) { @@ -325,6 +328,7 @@ void tst_QItemModel::hasIndex() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Make sure that invalid values returns an invalid index QCOMPARE(currentModel->hasIndex(-2, -2), false); @@ -359,6 +363,7 @@ void tst_QItemModel::index() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Make sure that invalid values returns an invalid index QCOMPARE(currentModel->index(-2, -2), QModelIndex()); @@ -489,6 +494,7 @@ void tst_QItemModel::parent() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Make sure the model wont crash and will return an invalid QModelIndex // when asked for the parent of an invalid index. @@ -538,6 +544,7 @@ void tst_QItemModel::data() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Invalid index should return an invalid qvariant QVERIFY(!currentModel->data(QModelIndex()).isValid()); @@ -618,6 +625,7 @@ void tst_QItemModel::setData() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); qRegisterMetaType("QModelIndex"); QSignalSpy spy(currentModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &))); QCOMPARE(currentModel->setData(QModelIndex(), QVariant()), false); @@ -660,6 +668,7 @@ void tst_QItemModel::setHeaderData() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QCOMPARE(currentModel->setHeaderData(-1, Qt::Horizontal, QVariant()), false); QCOMPARE(currentModel->setHeaderData(-1, Qt::Vertical, QVariant()), false); @@ -708,6 +717,7 @@ void tst_QItemModel::sort() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, isEmpty); if (isEmpty) @@ -819,6 +829,7 @@ void tst_QItemModel::remove() QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, readOnly); if (readOnly) @@ -1160,6 +1171,7 @@ void tst_QItemModel::insert() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, readOnly); if (readOnly) diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp index d91b068c5f..36c89a03fe 100644 --- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -2289,7 +2289,7 @@ void tst_QItemSelectionModel::QTBUG5671_layoutChangedWithAllSelected() struct MyFilterModel : public QSortFilterProxyModel { // Override sort filter proxy to remove even numbered rows. bool filtering; - virtual bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const + virtual bool filterAcceptsRow( int source_row, const QModelIndex& /* source_parent */) const { return !filtering || !( source_row & 1 ); } @@ -2373,7 +2373,7 @@ public: } public slots: - void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) + void selectionChanged(const QItemSelection & /* selected */, const QItemSelection &deselected) { foreach(const QModelIndex &index, deselected.indexes()) { QVERIFY(!m_itemSelectionModel->selection().contains(index)); diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp index 220a174c9a..fa8367e145 100644 --- a/tests/auto/qitemview/tst_qitemview.cpp +++ b/tests/auto/qitemview/tst_qitemview.cpp @@ -148,12 +148,18 @@ public: CheckerModel() : QStandardItemModel() {}; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole ) const { - Q_ASSERT(index.isValid()); + if (!index.isValid()) { + qWarning("%s: index is not valid", Q_FUNC_INFO); + return QVariant(); + } return QStandardItemModel::data(index, role); }; Qt::ItemFlags flags(const QModelIndex & index) const { - Q_ASSERT(index.isValid()); + if (!index.isValid()) { + qWarning("%s: index is not valid", Q_FUNC_INFO); + return Qt::ItemFlags(); + } if (index.row() == 2 || index.row() == rowCount() - 3 || index.column() == 2 || index.column() == columnCount() - 3) { Qt::ItemFlags f = QStandardItemModel::flags(index); @@ -164,14 +170,26 @@ public: }; QModelIndex parent ( const QModelIndex & child ) const { - Q_ASSERT(child.isValid()); + if (!child.isValid()) { + qWarning("%s: child index is not valid", Q_FUNC_INFO); + return QModelIndex(); + } return QStandardItemModel::parent(child); }; QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const { - Q_ASSERT(section >= 0); - if (orientation == Qt::Horizontal) { Q_ASSERT(section <= columnCount());}; - if (orientation == Qt::Vertical) { Q_ASSERT(section <= rowCount());}; + if (orientation == Qt::Horizontal + && (section < 0 || section > columnCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, columnCount()); + return QVariant(); + } + if (orientation == Qt::Vertical + && (section < 0 || section > rowCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, rowCount()); + return QVariant(); + } return QStandardItemModel::headerData(section, orientation, role); } @@ -180,23 +198,46 @@ public: }; bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ) { - Q_ASSERT(index.isValid()); + if (!index.isValid()) { + qWarning("%s: index is not valid", Q_FUNC_INFO); + return false; + } return QStandardItemModel::setData(index, value, role); } void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) { - Q_ASSERT(column >= 0 && column <= columnCount()); - QStandardItemModel::sort(column, order); + if (column < 0 || column > columnCount()) + qWarning("%s: invalid column %d, must be in range 0..%d", + Q_FUNC_INFO, column, columnCount()); + else + QStandardItemModel::sort(column, order); }; QModelIndexList match ( const QModelIndex & start, int role, const QVariant & value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags( Qt::MatchStartsWith | Qt::MatchWrap ) ) const { - Q_ASSERT(hits > 0); - Q_ASSERT(value.isValid()); + if (hits <= 0) { + qWarning("%s: hits must be greater than zero", Q_FUNC_INFO); + return QModelIndexList(); + } + if (!value.isValid()) { + qWarning("%s: value is not valid", Q_FUNC_INFO); + return QModelIndexList(); + } return QAbstractItemModel::match(start, role, value, hits, flags); }; bool setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::EditRole ) { - Q_ASSERT(section >= 0); + if (orientation == Qt::Horizontal + && (section < 0 || section > columnCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, columnCount()); + return false; + } + if (orientation == Qt::Vertical + && (section < 0 || section > rowCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, rowCount()); + return false; + } return QAbstractItemModel::setHeaderData(section, orientation, value, role); }; }; @@ -297,9 +338,11 @@ void tst_QItemView::nonDestructiveBasicTest() #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); @@ -454,9 +497,11 @@ void tst_QItemView::spider() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->setModel(treeModel); @@ -489,9 +534,11 @@ void tst_QItemView::resize() // This test needs to be re-thought out, it takes too long and // doesn't really catch theproblem. QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->setModel(treeModel); @@ -517,9 +564,11 @@ void tst_QItemView::visualRect() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); QCOMPARE(view->visualRect(QModelIndex()), QRect()); @@ -651,9 +700,11 @@ void tst_QItemView::indexAt() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->show(); @@ -685,9 +736,11 @@ void tst_QItemView::scrollTo() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->setModel(treeModel); @@ -735,6 +788,7 @@ void tst_QItemView::moveCursor() #endif QFETCH(QString, viewType); view = testViews->createView(viewType); + QVERIFY(view); if (view->objectName() == "QHeaderView") return; diff --git a/tests/auto/qitemview/viewstotest.cpp b/tests/auto/qitemview/viewstotest.cpp index 3aa355d3a1..5e21daffeb 100644 --- a/tests/auto/qitemview/viewstotest.cpp +++ b/tests/auto/qitemview/viewstotest.cpp @@ -141,7 +141,6 @@ QAbstractItemView *ViewsToTest::createView(const QString &viewType) view->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); view->setSelectionBehavior(QAbstractItemView::SelectItems); } - Q_ASSERT(view); return view; } diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index 3090ebb684..f69a99c312 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -76,9 +76,6 @@ private slots: void geometry(); void smartMaxSize(); void setLayoutBugs(); -#ifdef QT3_SUPPORT - void task193350_sizeGrip(); -#endif void setContentsMargins(); void layoutItemRect(); void warnIfWrongParent(); @@ -185,16 +182,16 @@ void tst_QLayout::smartMaxSize() int expectedIndex = 0; int regressionCount = 0; - for (int p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) { + for (size_t p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) { QSizePolicy sizePolicy; sizePolicy.setHorizontalPolicy(policies[p]); - for (int min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) { + for (size_t min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) { int minSize = sizeCombinations[min]; - for (int max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) { + for (size_t max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) { int maxSize = sizeCombinations[max]; - for (int sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) { + for (size_t sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) { int sizeHint = sizeCombinations[sh]; - for (int a = 0; a < sizeof(alignments)/sizeof(int); ++a) { + for (size_t a = 0; a < sizeof(alignments)/sizeof(int); ++a) { Qt::Alignment align = alignments[a]; QSize sz = qSmartMaxSize(QSize(sizeHint, 1), QSize(minSize, 1), QSize(maxSize, 1), sizePolicy, align); int width = sz.width(); @@ -235,21 +232,6 @@ void tst_QLayout::setLayoutBugs() QVERIFY(containerWidget.layout() == hBoxLayout); } -#ifdef QT3_SUPPORT -void tst_QLayout::task193350_sizeGrip() -{ - QDialog dialog; - dialog.setSizeGripEnabled(true); - - QVBoxLayout* layout = new QVBoxLayout(&dialog); - layout->setAutoAdd(true); - new QLabel("Label", &dialog); - - dialog.show(); - QCOMPARE(layout->indexOf(qFindChild(&dialog)),-1); -} -#endif - class MyLayout : public QLayout { public: diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/qlibrary/tst_qlibrary.cpp index c79332d276..a8c60c93c2 100644 --- a/tests/auto/qlibrary/tst_qlibrary.cpp +++ b/tests/auto/qlibrary/tst_qlibrary.cpp @@ -468,7 +468,7 @@ void tst_QLibrary::errorString() } break;} default: - Q_ASSERT(0); + QFAIL(qPrintable(QString("Unknown operation: %1").arg(operation))); break; } QRegExp re(errorString); diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index d5d9029b12..a7a5bd7b4b 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -277,11 +277,6 @@ private slots: void QTBUG697_paletteCurrentColorGroup(); void QTBUG13520_textNotVisible(); -#ifdef QT3_SUPPORT - void validateAndSet_data(); - void validateAndSet(); -#endif - void bidiVisualMovement_data(); void bidiVisualMovement(); @@ -289,9 +284,6 @@ private slots: void bidiLogicalMovement(); protected slots: -#ifdef QT3_SUPPORT - void lostFocus(); -#endif void editingFinished(); void onTextChanged( const QString &newString ); @@ -360,9 +352,6 @@ void tst_QLineEdit::initTestCase() connect(testWidget, SIGNAL(returnPressed()), this, SLOT(onReturnPressed())); connect(testWidget, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); connect(testWidget, SIGNAL(editingFinished()), this, SLOT(editingFinished())); -#ifdef QT3_SUPPORT - connect(testWidget, SIGNAL(lostFocus()), this, SLOT(lostFocus())); -#endif testWidget->resize(200,50); testWidget->show(); @@ -1498,40 +1487,6 @@ void tst_QLineEdit::clear() QCOMPARE(testWidget->text(), QString("I am Legend")); } -#ifdef QT3_SUPPORT -void tst_QLineEdit::lostFocus() -{ - editingFinished(); -} - -void tst_QLineEdit::validateAndSet_data() -{ - QTest::addColumn("newText"); - QTest::addColumn("newPos"); - QTest::addColumn("newMarkAnchor"); - QTest::addColumn("newMarkDrag"); - - QTest::newRow("1") << QString("Hello World") << 3 << 3 << 5; - QTest::newRow("2") << QString("Hello World") << 5 << 3 << 5; -} - -void tst_QLineEdit::validateAndSet() -{ - QFETCH(QString, newText); - QFETCH(int, newPos); - QFETCH(int, newMarkAnchor); - QFETCH(int, newMarkDrag); - - QLineEdit e; - e.validateAndSet(newText, newPos, newMarkAnchor, newMarkDrag); - QCOMPARE(e.text(), newText); - QCOMPARE(e.cursorPosition(), newPos); - QCOMPARE(e.selectedText(), newText.mid(newMarkAnchor, newMarkDrag-newMarkAnchor)); -} - - - -#endif void tst_QLineEdit::editingFinished() { if (testWidget->hasAcceptableInput()) @@ -2660,16 +2615,6 @@ void tst_QLineEdit::setAlignment() #endif QVERIFY(testWidget->alignment() == Qt::AlignLeft); -#ifdef QT3_SUPPORT - testWidget->setText("auto"); - testWidget->setAlignment(Qt::AlignAuto); -#ifndef NO_PIXMAP_TESTS -#if defined Q_WS_WIN - QTEST(testWidget, "auto"); -#endif -#endif -#endif - testWidget->setText("hcenter"); testWidget->setAlignment(Qt::AlignHCenter); #ifndef NO_PIXMAP_TESTS @@ -2679,16 +2624,6 @@ void tst_QLineEdit::setAlignment() #endif QVERIFY(testWidget->alignment() == Qt::AlignHCenter); -#ifdef QT3_SUPPORT - testWidget->setText("auto"); - testWidget->setAlignment(Qt::AlignAuto); -#ifndef NO_PIXMAP_TESTS -#if defined Q_WS_WIN - QTEST(testWidget, "auto"); -#endif -#endif -#endif - testWidget->setText("right"); testWidget->setAlignment(Qt::AlignRight); #ifndef NO_PIXMAP_TESTS @@ -2698,17 +2633,6 @@ void tst_QLineEdit::setAlignment() #endif QVERIFY(testWidget->alignment() == Qt::AlignRight); -#ifdef QT3_SUPPORT - testWidget->setText("auto"); - testWidget->setAlignment(Qt::AlignAuto); -#ifndef NO_PIXMAP_TESTS -#if defined Q_WS_WIN - QTEST(testWidget, "auto"); -#endif -#endif - QVERIFY(testWidget->alignment() == Qt::AlignAuto); -#endif - testWidget->setAlignment(Qt::AlignTop); QVERIFY(testWidget->alignment() == Qt::AlignTop); diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro index faf970d027..eb4c335b5b 100644 --- a/tests/auto/qlistwidget/qlistwidget.pro +++ b/tests/auto/qlistwidget/qlistwidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qlistwidget.cpp diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 2b7eaaefbc..2ffc9e923b 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -326,7 +326,7 @@ void tst_QLocale::ctor() TEST_CTOR("en-GB", English, UnitedKingdom) TEST_CTOR("en-GB@bla", English, UnitedKingdom) - Q_ASSERT(QLocale::Norwegian == QLocale::NorwegianBokmal); + QVERIFY(QLocale::Norwegian == QLocale::NorwegianBokmal); TEST_CTOR("no", Norwegian, Norway) TEST_CTOR("nb", Norwegian, Norway) TEST_CTOR("nn", NorwegianNynorsk, Norway) @@ -431,7 +431,7 @@ void tst_QLocale::emptyCtor() TEST_CTOR("en_GB@bla", "en_GB") TEST_CTOR("de", "de_DE") - Q_ASSERT(QLocale::Norwegian == QLocale::NorwegianBokmal); + QVERIFY(QLocale::Norwegian == QLocale::NorwegianBokmal); TEST_CTOR("no", "nb_NO") TEST_CTOR("nb", "nb_NO") TEST_CTOR("nn", "nn_NO") diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/qmainwindow/qmainwindow.pro index e015f95ec1..0f6d71c6ec 100644 --- a/tests/auto/qmainwindow/qmainwindow.pro +++ b/tests/auto/qmainwindow/qmainwindow.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qmainwindow.cpp - +QT += gui-private # Symbian toolchain does not support correct include semantics symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private diff --git a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp b/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp index 3c850d486b..a023aa6354 100644 --- a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp +++ b/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp @@ -1,3 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + int main(int,char**) { } diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index 1367e1f37d..4845077cde 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -90,10 +90,6 @@ private slots: void tearOff(); void layoutDirection(); -#if defined(QT3_SUPPORT) - void indexBasedInsertion_data(); - void indexBasedInsertion(); -#endif void task208001_stylesheet(); void activeSubMenuPosition(); void task242454_sizeHint(); @@ -641,49 +637,6 @@ void tst_QMenu::layoutDirection() QCOMPARE(menu.layoutDirection(), Qt::RightToLeft); } - - -#if defined(QT3_SUPPORT) -void tst_QMenu::indexBasedInsertion_data() -{ - QTest::addColumn("indexForInsertion"); - QTest::addColumn("expectedIndex"); - - QTest::newRow("negative-index-appends") << -1 << 1; - QTest::newRow("prepend") << 0 << 0; - QTest::newRow("append") << 1 << 1; -} - -void tst_QMenu::indexBasedInsertion() -{ - // test the compat'ed index based insertion - - QFETCH(int, indexForInsertion); - QFETCH(int, expectedIndex); - - { - QMenu menu; - menu.addAction("Regular Item"); - - menu.insertItem("New Item", -1 /*id*/, indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QCOMPARE(act->text(), QString("New Item")); - } - { - QMenu menu; - menu.addAction("Regular Item"); - - menu.insertSeparator(indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QVERIFY(act->isSeparator()); - } -} -#endif - void tst_QMenu::task208001_stylesheet() { //test if it crash @@ -789,7 +742,7 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition() while (main.columnCount() < 2) { main.addAction(QString("Item %1").arg(i)); ++i; - Q_ASSERT(i<1000); + QVERIFY(i<1000); } main.setActiveAction(menuAction); sub.setActiveAction(subAction); diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index 6e12d7b7dc..9b5bc4ccf8 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -44,9 +44,6 @@ #include #include #include -#ifdef QT3_SUPPORT -#include -#endif #include #include #include @@ -105,15 +102,8 @@ public: tst_QMenuBar(); virtual ~tst_QMenuBar(); -#ifdef QT3_SUPPORT void initSimpleMenubar(); -#endif - void initSimpleMenubar_noQt3(); - -#ifdef QT3_SUPPORT void initComplexMenubar(); -#endif - void initComplexMenubar_noQt3(); public slots: void initTestCase(); @@ -122,27 +112,16 @@ public slots: private slots: void getSetCheck(); - void clear_noQt3(); - void removeItemAt_noQt3(); - void removeItemAt_noQt3_data(); - void removeItem_noQt3_data(); - void removeItem_noQt3(); - void count_noQt3(); - void insertItem_QString_QObject_noQt3(); - void accel_noQt3(); - void activatedCount_noQt3(); - void allowActiveAndDisabled(); -#ifdef QT3_SUPPORT void clear(); - void removeItemAt_data(); void removeItemAt(); + void removeItemAt_data(); void removeItem_data(); void removeItem(); void count(); void insertItem_QString_QObject(); void accel(); void activatedCount(); -#endif + void allowActiveAndDisabled(); void check_accelKeys(); void check_cursorKeys1(); @@ -151,10 +130,7 @@ private slots: void check_homeKey(); void check_endKey(); -#ifdef QT3_SUPPORT void check_escKey(); -#endif - void check_escKey_noQt3(); // void check_mouse1_data(); // void check_mouse1(); @@ -170,21 +146,10 @@ private slots: void taskQTBUG4965_escapeEaten(); void taskQTBUG11823_crashwithInvisibleActions(); -#if defined(QT3_SUPPORT) - void indexBasedInsertion_data(); - void indexBasedInsertion(); -#endif - protected slots: -#ifdef QT3_SUPPORT - void onActivated( int ); -#endif - void onActivated_noQt3( QAction*); + void onActivated( QAction*); private: - - void initTestCase_noQt3(); - QtTestSlot *menu1; QtTestSlot *menu2; QtTestSlot *menu3; @@ -204,26 +169,15 @@ private: void reset() { resetSlots(); resetCount(); }; -#ifdef QT3_SUPPORT - int last_accel_id; -#endif - QAction* last_accel_id_Qt4; + QAction* last_accel_id; int activated_count; -#ifdef QT3_SUPPORT - int idAccel; - int idAccel1; -#endif QAction *action; QAction *action1; QMainWindow *mw; QMenuBar *mb; -#ifdef QT3_SUPPORT - Q3PopupMenu *pm1; - Q3PopupMenu *pm2; -#endif - QMenu *pm1_Qt4; - QMenu *pm2_Qt4; + QMenu *pm1; + QMenu *pm2; }; // Testing get/set functions @@ -240,10 +194,6 @@ void tst_QMenuBar::getSetCheck() delete var1; } -//// - - - #include const int RESET = 0; @@ -278,14 +228,9 @@ tst_QMenuBar::tst_QMenuBar() activated_count = 0; mb = 0; -#ifdef QT3_SUPPORT pm1 = 0; pm2 = 0; - last_accel_id = RESET; -#endif - pm1_Qt4 = 0; - pm2_Qt4 = 0; - last_accel_id_Qt4 = 0; + last_accel_id = 0; } tst_QMenuBar::~tst_QMenuBar() @@ -295,48 +240,15 @@ tst_QMenuBar::~tst_QMenuBar() } void tst_QMenuBar::initTestCase() -{ -#ifdef QT3_SUPPORT - // create a default mainwindow - // If you run a widget test, this will be replaced in the testcase by the - // widget under test - mw = new QMainWindow(0, Qt::X11BypassWindowManagerHint); - mb = new QMenuBar( mw, "menubar" ); - connect( mb, SIGNAL(activated(int)), this, SLOT(onActivated(int)) ); - - initSimpleMenubar(); - - qApp->setMainWidget( mw ); - mw->show(); - qApp->setActiveWindow(mw); - - menu1 = new QtTestSlot( mw ); - menu2 = new QtTestSlot( mw ); - menu3 = new QtTestSlot( mw ); - menu4 = new QtTestSlot( mw ); - item1_A = new QtTestSlot( mw ); - item1_B = new QtTestSlot( mw ); - item2_C = new QtTestSlot( mw ); - item2_D = new QtTestSlot( mw ); - item2_E = new QtTestSlot( mw ); - item2_F = new QtTestSlot( mw ); - item2_G = new QtTestSlot( mw ); - item2_H = new QtTestSlot( mw ); -#else - initTestCase_noQt3(); -#endif -} - -void tst_QMenuBar::initTestCase_noQt3() { // create a default mainwindow // If you run a widget test, this will be replaced in the testcase by the // widget under test mw = new QMainWindow(0, Qt::X11BypassWindowManagerHint); mb = new QMenuBar( mw ); - connect( mb, SIGNAL(triggered(QAction *)), this, SLOT(onActivated_noQt3(QAction *)) ); + connect( mb, SIGNAL(triggered(QAction *)), this, SLOT(onActivated(QAction *)) ); - initSimpleMenubar_noQt3(); + initSimpleMenubar(); mw->show(); QTest::qWaitForWindowShown(mw); mw->activateWindow(); @@ -361,53 +273,25 @@ void tst_QMenuBar::cleanupTestCase() delete mw; } -#if defined(QT3_SUPPORT) void tst_QMenuBar::initSimpleMenubar() { mb->hide(); mb->clear(); delete pm1; - pm1 = new Q3PopupMenu( mb ); - idAccel = pm1->insertItem( "menu1", 123 ); -// pm->setAccel( ALT + Key_A, idAccel ); - pm1->setAccel( Qt::CTRL + Qt::Key_A, idAccel ); - mb->insertItem( "&accel", pm1 ); - connect( pm1, SIGNAL(activated(int)), this, SLOT(onActivated(int))); + pm1 = mb->addMenu("&accel"); + action = pm1->addAction( "menu1" ); + action->setShortcut(QKeySequence("ALT+A")); + action->setShortcut(QKeySequence("CTRL+A")); + + connect( pm1, SIGNAL(triggered(QAction*)), this, SLOT(onActivated(QAction*))); delete pm2; - pm2 = new Q3PopupMenu( mb ); -// idAccel1 = pm2->insertItem( "&Open...", this, SLOT(onActivated(int)), Qt::Key_O, 456 ); - idAccel1 = pm2->insertItem( "&Open...", 0, 0, Qt::Key_O, 456 ); - connect(pm2, SIGNAL(activated(int)), this, SLOT(onActivated(int))); - mb->insertItem( "accel1", pm2 ); + pm2 = mb->addMenu("accel1"); - mb->show(); - qApp->syncX(); - qApp->processEvents(); -} -#endif - -void tst_QMenuBar::initSimpleMenubar_noQt3() -{ - mb->hide(); - mb->clear(); - - delete pm1_Qt4; - pm1_Qt4 = mb->addMenu("&accel"); - action = pm1_Qt4->addAction( "menu1" ); - action->setShortcut(QKeySequence("ALT+A")); - action->setShortcut(QKeySequence("CTRL+A")); - - - connect( pm1_Qt4, SIGNAL(triggered(QAction*)), this, SLOT(onActivated_noQt3(QAction*))); - - delete pm2_Qt4; - pm2_Qt4 = mb->addMenu("accel1"); - - action1 = pm2_Qt4->addAction( "&Open..." ); + action1 = pm2->addAction( "&Open..." ); action1->setShortcut(Qt::Key_O); - connect(pm2_Qt4, SIGNAL(triggered(QAction*)), this, SLOT(onActivated_noQt3(QAction*))); + connect(pm2, SIGNAL(triggered(QAction*)), this, SLOT(onActivated(QAction*))); mb->show(); qApp->syncX(); @@ -438,47 +322,19 @@ void tst_QMenuBar::resetSlots() void tst_QMenuBar::resetCount() { -#ifdef QT3_SUPPORT - last_accel_id = RESET; -#endif - last_accel_id_Qt4 = 0; + last_accel_id = 0; activated_count = 0; } -#ifdef QT3_SUPPORT -void tst_QMenuBar::onActivated( int i ) +void tst_QMenuBar::onActivated( QAction* action ) { - last_accel_id = i; - activated_count++; -// printf( QString("acceleratorId: %1, count: %1\n").arg( i ).arg(activated_count) ); -} -#endif - -void tst_QMenuBar::onActivated_noQt3( QAction* action ) -{ - last_accel_id_Qt4 = action; + last_accel_id = action; activated_count++; // printf( QString("acceleratorId: %1, count: %1\n").arg( i ).arg(activated_count) ); } -#ifdef QT3_SUPPORT void tst_QMenuBar::accel() { -#ifdef Q_WS_MAC - QSKIP("On Mac, native key events are needed to test menu action activation", SkipAll); -#endif - // create a popup menu with menu items set the accelerators later... - initSimpleMenubar(); -// QTest::keyClick( 0, Qt::Key_A, AltKey ); - QTest::keyClick( 0, Qt::Key_A, Qt::ControlModifier ); - QTest::qWait(300); - - QCOMPARE( last_accel_id, idAccel ); -} -#endif //QT3_SUPPORT - -void tst_QMenuBar::accel_noQt3() -{ #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); #endif @@ -487,19 +343,18 @@ void tst_QMenuBar::accel_noQt3() #endif // create a popup menu with menu items set the accelerators later... - initSimpleMenubar_noQt3(); + initSimpleMenubar(); // QTest::keyClick( 0, Qt::Key_A, AltKey ); QTest::keyClick( 0, Qt::Key_A, Qt::ControlModifier ); QTest::qWait(300); - QCOMPARE( last_accel_id_Qt4, action ); + QCOMPARE( last_accel_id, action ); } -#ifdef QT3_SUPPORT void tst_QMenuBar::activatedCount() { -#ifdef Q_WS_MAC - QSKIP("On Mac, native key events are needed to test menu action activation", SkipAll); +#if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) + QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); #endif // create a popup menu with menu items set the accelerators later... initSimpleMenubar(); @@ -508,22 +363,8 @@ void tst_QMenuBar::activatedCount() //wait(5000); QCOMPARE( activated_count, 2 ); //1 from the popupmenu and 1 from the menubar } -#endif //QT3_SUPPORT -void tst_QMenuBar::activatedCount_noQt3() -{ -#if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) - QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); -#endif - // create a popup menu with menu items set the accelerators later... - initSimpleMenubar_noQt3(); - - QTest::keyClick( 0, Qt::Key_A, Qt::ControlModifier ); -//wait(5000); - QCOMPARE( activated_count, 2 ); //1 from the popupmenu and 1 from the menubar -} - -void tst_QMenuBar::clear_noQt3() +void tst_QMenuBar::clear() { mb->clear(); QVERIFY( (uint) mb->actions().size() == 0 ); @@ -541,7 +382,7 @@ void tst_QMenuBar::clear_noQt3() QVERIFY( (uint) mb->actions().size() == 0 ); } -void tst_QMenuBar::count_noQt3() +void tst_QMenuBar::count() { mb->clear(); QVERIFY( mb->actions().size() == 0 ); @@ -552,7 +393,7 @@ void tst_QMenuBar::count_noQt3() } } -void tst_QMenuBar::removeItem_noQt3_data() +void tst_QMenuBar::removeItem_data() { QTest::addColumn("removeIndex"); QTest::newRow( "first" ) << 0; @@ -561,7 +402,7 @@ void tst_QMenuBar::removeItem_noQt3_data() } // Basically the same test as removeItemAt, except that we remember and remove id's. -void tst_QMenuBar::removeItem_noQt3() +void tst_QMenuBar::removeItem() { mb->clear(); @@ -623,7 +464,7 @@ void tst_QMenuBar::removeItem_noQt3() QVERIFY( menuBarActions2.size() == 2 ); } -void tst_QMenuBar::removeItemAt_noQt3_data() +void tst_QMenuBar::removeItemAt_data() { QTest::addColumn("removeIndex"); QTest::newRow( "first" ) << 0; @@ -631,7 +472,7 @@ void tst_QMenuBar::removeItemAt_noQt3_data() QTest::newRow( "last" ) << 2; } -void tst_QMenuBar::removeItemAt_noQt3() +void tst_QMenuBar::removeItemAt() { mb->clear(); @@ -680,202 +521,25 @@ void tst_QMenuBar::removeItemAt_noQt3() QVERIFY( menuBarActions2.size() == 2 ); } -#ifdef QT3_SUPPORT -void tst_QMenuBar::clear() -{ - mb->clear(); - QVERIFY( mb->count() == 0 ); - - mb->clear(); - for (uint i=0; i<10; i++) { - Q3PopupMenu *pm = new Q3PopupMenu( mb ); - for (uint k=0; kinsertItem( QString("Item %1").arg(i*10 + k) ); - mb->insertItem( QString("Menu %1").arg(i), pm ); - QCOMPARE( mb->count(), (uint)i+1 ); - } - QCOMPARE( mb->count(), 10u ); - - mb->clear(); - QVERIFY( mb->count() == 0 ); -} - -void tst_QMenuBar::count() -{ - mb->clear(); - QVERIFY( mb->count() == 0 ); - - for (uint i=0; i<10; i++) { - Q3PopupMenu *pm = new Q3PopupMenu( mb ); - mb->insertItem( QString("Menu %1").arg(i), pm ); - QCOMPARE( mb->count(), i+1 ); - } -} - -void tst_QMenuBar::removeItemAt_data() -{ - QTest::addColumn("removeIndex"); - QTest::newRow( "first" ) << 0; - QTest::newRow( "middle" ) << 1; - QTest::newRow( "last" ) << 2; -} - -void tst_QMenuBar::removeItemAt() -{ - mb->clear(); - - Q3PopupMenu *pm; - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 10") ); - mb->insertItem( QString("Menu 1"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 20") ); - pm->insertItem( QString("Item 21") ); - mb->insertItem( QString("Menu 2"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 30") ); - pm->insertItem( QString("Item 31") ); - pm->insertItem( QString("Item 32") ); - mb->insertItem( QString("Menu 3"), pm ); - - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 2") ); - QCOMPARE( mb->text( mb->idAt(2) ), QString("Menu 3") ); - - // Ok, now that we know we have created the menu we expect, lets remove an item... - QFETCH( int, removeIndex ); - mb->removeItemAt( removeIndex ); - switch (removeIndex ) - { - case 0: - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 2") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 1: - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 2: - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 2") ); - break; - } - - QVERIFY( mb->count() == 2 ); -} - -void tst_QMenuBar::removeItem_data() -{ - QTest::addColumn("removeIndex"); - QTest::newRow( "first" ) << 0; - QTest::newRow( "middle" ) << 1; - QTest::newRow( "last" ) << 2; -} - -// Basically the same test as removeItemAt, except that we remember and remove id's. -void tst_QMenuBar::removeItem() -{ - mb->clear(); - - Q3PopupMenu *pm; - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 10") ); - int id1 = mb->insertItem( QString("Menu 1"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 20") ); - pm->insertItem( QString("Item 21") ); - int id2 = mb->insertItem( QString("Menu 2"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 30") ); - pm->insertItem( QString("Item 31") ); - pm->insertItem( QString("Item 32") ); - int id3 = mb->insertItem( QString("Menu 3"), pm ); - - QCOMPARE( mb->text( id1 ), QString("Menu 1") ); - QCOMPARE( mb->text( id2 ), QString("Menu 2") ); - QCOMPARE( mb->text( id3 ), QString("Menu 3") ); - - QVERIFY( mb->idAt(0) == id1 ); - QVERIFY( mb->idAt(1) == id2 ); - QVERIFY( mb->idAt(2) == id3 ); - - // Ok, now that we know we have created the menu we expect, lets remove an item... - QFETCH( int, removeIndex ); - switch (removeIndex ) - { - case 0: - mb->removeItem( id1 ); - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 2") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 1: - mb->removeItem( id2 ); - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 2: - mb->removeItem( id3 ); - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 2") ); - break; - } - - QVERIFY( mb->count() == 2 ); -} - void tst_QMenuBar::initComplexMenubar() // well, complex.... { mb->hide(); mb->clear(); delete pm1; - pm1 = new Q3PopupMenu( mb, "popup1" ); - pm1->insertItem( QString("Item A"), item1_A, SLOT(selected()), Qt::CTRL+Qt::Key_A ); - pm1->insertItem( QString("Item B"), item1_B, SLOT(selected()), Qt::CTRL+Qt::Key_B ); - // use the form insertItem( QString, Q3PopupMenu ) - mb->insertItem( "Menu &1", pm1 ); + pm1 = mb->addMenu("Menu &1"); + pm1->addAction( QString("Item A"), item1_A, SLOT(selected()), Qt::CTRL+Qt::Key_A ); + pm1->addAction( QString("Item B"), item1_B, SLOT(selected()), Qt::CTRL+Qt::Key_B ); delete pm2; - pm2 = new Q3PopupMenu( mb, "popup2" ); - pm2->insertItem( QString("Item C"), item2_C, SLOT(selected()), Qt::CTRL+Qt::Key_C ); - pm2->insertItem( QString("Item D"), item2_D, SLOT(selected()), Qt::CTRL+Qt::Key_D ); - pm2->insertItem( QString("Item E"), item2_E, SLOT(selected()), Qt::CTRL+Qt::Key_E ); - pm2->insertItem( QString("Item F"), item2_F, SLOT(selected()), Qt::CTRL+Qt::Key_F ); - pm2->insertSeparator(); - pm2->insertItem( QString("Item G"), item2_G, SLOT(selected()), Qt::CTRL+Qt::Key_G ); - pm2->insertItem( QString("Item H"), item2_H, SLOT(selected()), Qt::CTRL+Qt::Key_H ); - // use the form insertItem( QString, Q3PopupMenu ) - mb->insertItem( "Menu &2", pm2 ); - - // use the form insertItem( QString, QObject, slot, keysequence ) - mb->insertItem( QString("M&enu 3"), menu3, SLOT(selected()), Qt::ALT+Qt::Key_J ); - mb->show(); -} -#endif - -void tst_QMenuBar::initComplexMenubar_noQt3() // well, complex.... -{ - mb->hide(); - mb->clear(); - - delete pm1_Qt4; - pm1_Qt4 = mb->addMenu("Menu &1"); - pm1_Qt4->addAction( QString("Item A"), item1_A, SLOT(selected()), Qt::CTRL+Qt::Key_A ); - pm1_Qt4->addAction( QString("Item B"), item1_B, SLOT(selected()), Qt::CTRL+Qt::Key_B ); - - delete pm2_Qt4; - pm2_Qt4 = mb->addMenu("Menu &2"); - pm2_Qt4->addAction( QString("Item C"), item2_C, SLOT(selected()), Qt::CTRL+Qt::Key_C ); - pm2_Qt4->addAction( QString("Item D"), item2_D, SLOT(selected()), Qt::CTRL+Qt::Key_D ); - pm2_Qt4->addAction( QString("Item E"), item2_E, SLOT(selected()), Qt::CTRL+Qt::Key_E ); - pm2_Qt4->addAction( QString("Item F"), item2_F, SLOT(selected()), Qt::CTRL+Qt::Key_F ); - pm2_Qt4->addSeparator(); - pm2_Qt4->addAction( QString("Item G"), item2_G, SLOT(selected()), Qt::CTRL+Qt::Key_G ); - pm2_Qt4->addAction( QString("Item H"), item2_H, SLOT(selected()), Qt::CTRL+Qt::Key_H ); + pm2 = mb->addMenu("Menu &2"); + pm2->addAction( QString("Item C"), item2_C, SLOT(selected()), Qt::CTRL+Qt::Key_C ); + pm2->addAction( QString("Item D"), item2_D, SLOT(selected()), Qt::CTRL+Qt::Key_D ); + pm2->addAction( QString("Item E"), item2_E, SLOT(selected()), Qt::CTRL+Qt::Key_E ); + pm2->addAction( QString("Item F"), item2_F, SLOT(selected()), Qt::CTRL+Qt::Key_F ); + pm2->addSeparator(); + pm2->addAction( QString("Item G"), item2_G, SLOT(selected()), Qt::CTRL+Qt::Key_G ); + pm2->addAction( QString("Item H"), item2_H, SLOT(selected()), Qt::CTRL+Qt::Key_H ); QAction *ac = mb->addAction( QString("M&enu 3"), menu3, SLOT(selected())); ac->setShortcut(Qt::ALT+Qt::Key_J); @@ -889,20 +553,9 @@ void tst_QMenuBar::initComplexMenubar_noQt3() // well, complex.... used less frequently. */ -#ifdef QT3_SUPPORT void tst_QMenuBar::insertItem_QString_QObject() { initComplexMenubar(); - QCOMPARE( mb->text( mb->idAt( 0 ) ), QString("Menu &1") ); - QCOMPARE( mb->text( mb->idAt( 1 ) ), QString("Menu &2") ); - QCOMPARE( mb->text( mb->idAt( 2 ) ), QString("M&enu 3") ); - QCOMPARE( mb->text( mb->idAt( 3 ) ), QString() ); // there is no menu 4! -} -#endif - -void tst_QMenuBar::insertItem_QString_QObject_noQt3() -{ - initComplexMenubar_noQt3(); QList actions = mb->actions(); @@ -917,11 +570,7 @@ void tst_QMenuBar::check_accelKeys() #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // start with a bogus key that shouldn't trigger anything QTest::keyClick(0, Qt::Key_I, Qt::ControlModifier); @@ -991,11 +640,7 @@ void tst_QMenuBar::check_cursorKeys1() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // start with a ALT + 1 that activates the first popupmenu QTest::keyClick( 0, Qt::Key_1, Qt::AltModifier ); @@ -1026,11 +671,7 @@ void tst_QMenuBar::check_cursorKeys2() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select popupmenu2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1060,11 +701,7 @@ void tst_QMenuBar::check_cursorKeys3() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select Popupmenu 2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1095,11 +732,7 @@ void tst_QMenuBar::check_homeKey() QEXPECT_FAIL( "0", "Popupmenu should respond to a Home key", Abort ); -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select Popupmenu 2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1137,11 +770,7 @@ void tst_QMenuBar::check_endKey() QEXPECT_FAIL( "0", "Popupmenu should respond to an End key", Abort ); -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select Popupmenu 2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1170,11 +799,10 @@ void tst_QMenuBar::check_endKey() If Down is pressed next the popup is activated again. */ -#ifdef QT3_SUPPORT void tst_QMenuBar::check_escKey() { -#ifdef Q_WS_MAC - QSKIP("Qt/Mac does not use the native popups/menubar", SkipAll); +#if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) + QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif initComplexMenubar(); @@ -1195,9 +823,6 @@ void tst_QMenuBar::check_escKey() if (!QApplication::style()->inherits("QWindowsStyle")) return; - // but the menubar item should stay selected - QVERIFY( mb->isItemActive(mb->idAt(1)) ); - // If we press Down the popupmenu should be active again QTest::keyClick( 0, Qt::Key_Down ); QVERIFY( !pm1->isActiveWindow() ); @@ -1208,42 +833,6 @@ void tst_QMenuBar::check_escKey() // Let's see if the correct slot is called... QVERIFY2( item2_C->selCount() == 1, "Expected item 2C to be selected" ); } -#endif - -void tst_QMenuBar::check_escKey_noQt3() -{ -#if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) - QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); -#endif - - initComplexMenubar_noQt3(); - - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( !pm2_Qt4->isActiveWindow() ); - - // select Popupmenu 2 - QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( pm2_Qt4->isActiveWindow() ); - - // If we press ESC, the popup should disappear - QTest::keyClick( 0, Qt::Key_Escape ); - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( !pm2_Qt4->isActiveWindow() ); - - if (!QApplication::style()->inherits("QWindowsStyle")) - return; - - // If we press Down the popupmenu should be active again - QTest::keyClick( 0, Qt::Key_Down ); - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( pm2_Qt4->isActiveWindow() ); - - // and press ENTER - QTest::keyClick( pm2_Qt4, Qt::Key_Enter ); - // Let's see if the correct slot is called... - QVERIFY2( item2_C->selCount() == 1, "Expected item 2C to be selected" ); -} // void tst_QMenuBar::check_mouse1_data() @@ -1403,11 +992,7 @@ void tst_QMenuBar::check_altPress() arg( qApp->style()->objectName() ).toAscii(), SkipAll ); } -#ifdef QT3_SUPPORT initSimpleMenubar(); -#else - initSimpleMenubar_noQt3(); -#endif qApp->setActiveWindow(mw); mw->setFocus(); @@ -1423,11 +1008,7 @@ void tst_QMenuBar::check_shortcutPress() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif qApp->setActiveWindow(mw); QCOMPARE(menu3->selCount(), 0u); @@ -1437,17 +1018,9 @@ void tst_QMenuBar::check_shortcutPress() QVERIFY(!mb->activeAction()); QTest::keyClick(mw, Qt::Key_1, Qt::AltModifier ); -#ifdef QT3_SUPPORT QVERIFY(pm1->isActiveWindow()); -#else - QVERIFY(pm1_Qt4->isActiveWindow()); -#endif QTest::keyClick(mb, Qt::Key_2); -#ifdef QT3_SUPPORT - QVERIFY(pm1->isActiveWindow()); // Should still be the active window -#else - QVERIFY(pm1_Qt4->isActiveWindow()); -#endif + QVERIFY(pm1->isActiveWindow()); } void tst_QMenuBar::check_menuPosition() @@ -1459,11 +1032,7 @@ void tst_QMenuBar::check_menuPosition() QSKIP("Qt/CE uses native menubar", SkipAll); #endif Menu menu; -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif menu.setTitle("&menu"); QRect availRect = QApplication::desktop()->availableGeometry(mw); QRect screenRect = QApplication::desktop()->screenGeometry(mw); @@ -1720,47 +1289,5 @@ void tst_QMenuBar::taskQTBUG11823_crashwithInvisibleActions() QCOMPARE(menubar.activeAction(), m); //the active action shouldn't have changed } - -#if defined(QT3_SUPPORT) -void tst_QMenuBar::indexBasedInsertion_data() -{ - QTest::addColumn("indexForInsertion"); - QTest::addColumn("expectedIndex"); - - QTest::newRow("negative-index-appends") << -1 << 1; - QTest::newRow("prepend") << 0 << 0; - QTest::newRow("append") << 1 << 1; -} - -void tst_QMenuBar::indexBasedInsertion() -{ - // test the compat'ed index based insertion - - QFETCH(int, indexForInsertion); - QFETCH(int, expectedIndex); - - { - QMenuBar menu; - menu.addAction("Regular Item"); - - menu.insertItem("New Item", -1 /*id*/, indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QCOMPARE(act->text(), QString("New Item")); - } - { - QMenuBar menu; - menu.addAction("Regular Item"); - - menu.insertSeparator(indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QVERIFY(act->isSeparator()); - } -} -#endif - QTEST_MAIN(tst_QMenuBar) #include "tst_qmenubar.moc" diff --git a/tests/auto/qmessagebox/qmessagebox.pro b/tests/auto/qmessagebox/qmessagebox.pro index 8eeac774e9..9fa1738a79 100644 --- a/tests/auto/qmessagebox/qmessagebox.pro +++ b/tests/auto/qmessagebox/qmessagebox.pro @@ -7,8 +7,7 @@ TARGET = tst_qmessagebox DEPENDPATH += . INCLUDEPATH += . -CONFIG += console qtestlib qt3support -wince*: CONFIG -= qt3support +CONFIG += console qtestlib # Input SOURCES += tst_qmessagebox.cpp diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp index c11e76c098..23897838ab 100644 --- a/tests/auto/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp @@ -609,48 +609,43 @@ void tst_QMessageBox::testSymbols() button = QMessageBox::FlagMask; mb1.setText("Foo"); - QString text = mb1.text(); - Q_ASSERT(text == "Foo"); + QCOMPARE(mb1.text(), "Foo"); icon = mb1.icon(); - Q_ASSERT(icon == QMessageBox::NoIcon); + QVERIFY(icon == QMessageBox::NoIcon); mb1.setIcon(QMessageBox::Question); - Q_ASSERT(mb1.icon() == QMessageBox::Question); + QVERIFY(mb1.icon() == QMessageBox::Question); QPixmap iconPixmap = mb1.iconPixmap(); mb1.setIconPixmap(iconPixmap); - Q_ASSERT(mb1.icon() == QMessageBox::NoIcon); + QVERIFY(mb1.icon() == QMessageBox::NoIcon); - QString bt0 = mb1.buttonText(QMessageBox::Ok); - QString bt1 = mb1.buttonText(QMessageBox::Cancel); - QString bt2 = mb1.buttonText(QMessageBox::Ok | QMessageBox::Default); - - Q_ASSERT(bt0 == "OK"); - Q_ASSERT(bt1.isEmpty()); - Q_ASSERT(bt2.isEmpty()); + QCOMPARE(mb1.buttonText(QMessageBox::Ok), "OK"); + QCOMPARE(mb1.buttonText(QMessageBox::Cancel), QString()); + QCOMPARE(mb1.buttonText(QMessageBox::Ok | QMessageBox::Default), QString()); mb2.setButtonText(QMessageBox::Cancel, "Foo"); mb2.setButtonText(QMessageBox::Ok, "Bar"); mb2.setButtonText(QMessageBox::Ok | QMessageBox::Default, "Baz"); - Q_ASSERT(mb2.buttonText(QMessageBox::Cancel).isEmpty()); - Q_ASSERT(mb2.buttonText(QMessageBox::Ok) == "Bar"); + QCOMPARE(mb2.buttonText(QMessageBox::Cancel), QString()); + QCOMPARE(mb2.buttonText(QMessageBox::Ok), "Bar"); - Q_ASSERT(mb3b.buttonText(QMessageBox::Yes).endsWith("Yes")); - Q_ASSERT(mb3b.buttonText(QMessageBox::YesAll).isEmpty()); - Q_ASSERT(mb3b.buttonText(QMessageBox::Ok).isEmpty()); + QVERIFY(mb3b.buttonText(QMessageBox::Yes).endsWith("Yes")); + QCOMPARE(mb3b.buttonText(QMessageBox::YesAll), QString()); + QCOMPARE(mb3b.buttonText(QMessageBox::Ok), QString()); mb3b.setButtonText(QMessageBox::Yes, "Blah"); mb3b.setButtonText(QMessageBox::YesAll, "Zoo"); mb3b.setButtonText(QMessageBox::Ok, "Zoo"); - Q_ASSERT(mb3b.buttonText(QMessageBox::Yes) == "Blah"); - Q_ASSERT(mb3b.buttonText(QMessageBox::YesAll).isEmpty()); - Q_ASSERT(mb3b.buttonText(QMessageBox::Ok).isEmpty()); + QCOMPARE(mb3b.buttonText(QMessageBox::Yes), "Blah"); + QCOMPARE(mb3b.buttonText(QMessageBox::YesAll), QString()); + QCOMPARE(mb3b.buttonText(QMessageBox::Ok), QString()); - Q_ASSERT(mb1.textFormat() == Qt::AutoText); + QCOMPARE(mb1.textFormat(), Qt::AutoText); mb1.setTextFormat(Qt::PlainText); - Q_ASSERT(mb1.textFormat() == Qt::PlainText); + QCOMPARE(mb1.textFormat(), Qt::PlainText); CONVENIENCE_FUNC_SYMS(information); CONVENIENCE_FUNC_SYMS_EXTRA(information); @@ -660,43 +655,7 @@ void tst_QMessageBox::testSymbols() CONVENIENCE_FUNC_SYMS(critical); QSize sizeHint = mb1.sizeHint(); - Q_ASSERT(sizeHint.width() > 20 && sizeHint.height() > 20); - -#ifdef QT3_SUPPORT - //test QT3_SUPPORT stuff - - QMessageBox mb4("title", "text", icon, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default, - QMessageBox::Cancel, &mb1, "name", true, Qt::Dialog); - QMessageBox mb5(&mb1, "name"); - - QPixmap pm = QMessageBox::standardIcon(QMessageBox::Question, Qt::GUIStyle(1)); - QPixmap pm2 = QMessageBox::standardIcon(QMessageBox::Question); - - Q_ASSERT(pm.toImage() == iconPixmap.toImage()); - Q_ASSERT(pm2.toImage() == iconPixmap.toImage()); - - int ret1 = QMessageBox::message("title", "text"); - int ret2 = QMessageBox::message("title", "text", "OK"); - int ret3 = QMessageBox::message("title", "text", "OK", &mb1); - int ret4 = QMessageBox::message("title", "text", "OK", &mb1, "name"); - qDebug("%d %d %d %d", ret1, ret2, ret3, ret4); - - bool ret5 = QMessageBox::query("title", "text"); - bool ret6 = QMessageBox::query("title", "text", "Ja"); - bool ret7 = QMessageBox::query("title", "text", "Ja", "Nein"); - bool ret8 = QMessageBox::query("title", "text", "Ja", "Nein", &mb1); - bool ret9 = QMessageBox::query("title", "text", "Ja", "Nein", &mb1, "name"); - qDebug("%d %d %d %d %d", ret5, ret6, ret7, ret8, ret9); - - Q_UNUSED(ret1); - Q_UNUSED(ret5); - - QPixmap pm3 = QMessageBox::standardIcon(QMessageBox::NoIcon); - Q_ASSERT(pm3.isNull()); - - pm3 = QMessageBox::standardIcon(QMessageBox::Information); - Q_ASSERT(!pm3.isNull()); -#endif //QT3_SUPPORT + QVERIFY(sizeHint.width() > 20 && sizeHint.height() > 20); QMessageBox::about(&mb1, "title", "text"); QMessageBox::aboutQt(&mb1); diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index 13e3bcd588..f1a909a941 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -244,7 +244,12 @@ public: QObject *child; public slots: - void on_child1_destroyed(QObject *obj = 0) { ++invokeCount1; Q_ASSERT(obj && obj == child); } + void on_child1_destroyed(QObject *obj = 0) + { + ++invokeCount1; + if (!obj || obj != child) + qWarning() << "on_child1_destroyed invoked with wrong child object"; + } void on_child2_destroyed() { ++invokeCount2; } }; @@ -268,7 +273,12 @@ public: } private slots: - void on_child1_destroyed(QObject *obj) { ++invokeCount1; Q_ASSERT(obj && obj == child); } + void on_child1_destroyed(QObject *obj) + { + ++invokeCount1; + if (!obj || obj != child) + qWarning() << "on_child1_destroyed invoked with wrong child object"; + } void on_child1_destroyed() { ++invokeCount2; } }; diff --git a/tests/auto/qmetatype/tst_qmetatype.cpp b/tests/auto/qmetatype/tst_qmetatype.cpp index 9872682f89..1755856ece 100644 --- a/tests/auto/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/qmetatype/tst_qmetatype.cpp @@ -96,10 +96,18 @@ struct Bar Bar() { // check re-entrancy - Q_ASSERT(QMetaType::isRegistered(qRegisterMetaType("Foo"))); + if (!QMetaType::isRegistered(qRegisterMetaType("Foo"))) { + qWarning("%s: re-entrancy test failed", Q_FUNC_INFO); + ++failureCount; + } } + +public: + static int failureCount; }; +int Bar::failureCount = 0; + class MetaTypeTorturer: public QThread { Q_OBJECT @@ -113,17 +121,35 @@ protected: #ifdef Q_OS_LINUX pthread_yield(); #endif - Q_ASSERT(QMetaType::isRegistered(tp)); - Q_ASSERT(QMetaType::type(nm) == tp); - Q_ASSERT(QMetaType::typeName(tp) == name); + if (!QMetaType::isRegistered(tp)) { + ++failureCount; + qWarning() << name << "is not a registered metatype"; + } + if (QMetaType::type(nm) != tp) { + ++failureCount; + qWarning() << "Wrong metatype returned for" << name; + } + if (QMetaType::typeName(tp) != name) { + ++failureCount; + qWarning() << "Wrong typeName returned for" << tp; + } void *buf = QMetaType::construct(tp, 0); void *buf2 = QMetaType::construct(tp, buf); - Q_ASSERT(buf); - Q_ASSERT(buf2); + if (!buf) { + ++failureCount; + qWarning() << "Null buffer returned by QMetaType::construct(tp, 0)"; + } + if (!buf2) { + ++failureCount; + qWarning() << "Null buffer returned by QMetaType::construct(tp, buf)"; + } QMetaType::destroy(tp, buf); QMetaType::destroy(tp, buf2); } } +public: + MetaTypeTorturer() : failureCount(0) { } + int failureCount; }; void tst_QMetaType::threadSafety() @@ -139,6 +165,11 @@ void tst_QMetaType::threadSafety() QVERIFY(t1.wait()); QVERIFY(t2.wait()); QVERIFY(t3.wait()); + + QCOMPARE(t1.failureCount, 0); + QCOMPARE(t2.failureCount, 0); + QCOMPARE(t3.failureCount, 0); + QCOMPARE(Bar::failureCount, 0); } namespace TestSpace diff --git a/tests/auto/qmouseevent/tst_qmouseevent.cpp b/tests/auto/qmouseevent/tst_qmouseevent.cpp index 9d61e7d396..d86c5cc8b2 100644 --- a/tests/auto/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/qmouseevent/tst_qmouseevent.cpp @@ -62,17 +62,9 @@ public: } bool mousePressEventRecieved; bool mouseReleaseEventRecieved; -#ifdef QT3_SUPPORT - int mousePressStateBefore; - int mousePressStateAfter; -#endif int mousePressButton; int mousePressButtons; int mousePressModifiers; -#ifdef QT3_SUPPORT - int mouseReleaseStateBefore; - int mouseReleaseStateAfter; -#endif int mouseReleaseButton; int mouseReleaseButtons; int mouseReleaseModifiers; @@ -80,10 +72,6 @@ protected: void mousePressEvent(QMouseEvent *e) { QWidget::mousePressEvent(e); -#ifdef QT3_SUPPORT - mousePressStateBefore = e->state(); - mousePressStateAfter = e->stateAfter(); -#endif mousePressButton = e->button(); mousePressButtons = e->buttons(); mousePressModifiers = e->modifiers(); @@ -93,10 +81,6 @@ protected: void mouseReleaseEvent(QMouseEvent *e) { QWidget::mouseReleaseEvent(e); -#ifdef QT3_SUPPORT - mouseReleaseStateBefore = e->state(); - mouseReleaseStateAfter = e->stateAfter(); -#endif mouseReleaseButton = e->button(); mouseReleaseButtons = e->buttons(); mouseReleaseModifiers = e->modifiers(); @@ -125,8 +109,6 @@ private slots: void checkMouseReleaseEvent_data(); void checkMouseReleaseEvent(); - void qt3supportConstructors(); - private: MouseEventWidget* testMouseWidget; }; @@ -157,12 +139,6 @@ void tst_QMouseEvent::init() { testMouseWidget->mousePressEventRecieved = FALSE; testMouseWidget->mouseReleaseEventRecieved = FALSE; -#ifdef QT3_SUPPORT - testMouseWidget->mousePressStateBefore = 0; - testMouseWidget->mousePressStateAfter = 0; - testMouseWidget->mouseReleaseStateBefore = 0; - testMouseWidget->mouseReleaseStateAfter = 0; -#endif testMouseWidget->mousePressButton = 0; testMouseWidget->mousePressButtons = 0; testMouseWidget->mousePressModifiers = 0; @@ -210,13 +186,6 @@ void tst_QMouseEvent::checkMousePressEvent() QCOMPARE(testMouseWidget->mousePressButton, button); QCOMPARE(testMouseWidget->mousePressButtons, buttons); QCOMPARE(testMouseWidget->mousePressModifiers, modifiers); -#ifdef QT3_SUPPORT - int stateAfter = buttons|modifiers; - int stateBefore = stateAfter & ~button; - - QCOMPARE(testMouseWidget->mousePressStateBefore, stateBefore); - QCOMPARE(testMouseWidget->mousePressStateAfter, stateAfter); -#endif QTest::mouseRelease(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed)); } @@ -256,35 +225,6 @@ void tst_QMouseEvent::checkMouseReleaseEvent() QCOMPARE(testMouseWidget->mouseReleaseButton, button); QCOMPARE(testMouseWidget->mouseReleaseButtons, buttons); QCOMPARE(testMouseWidget->mouseReleaseModifiers, modifiers); -#ifdef QT3_SUPPORT - int stateAfter = buttons|modifiers; - int stateBefore = stateAfter|button; - - QCOMPARE(testMouseWidget->mouseReleaseStateBefore, stateBefore); - QCOMPARE(testMouseWidget->mouseReleaseStateAfter, stateAfter); -#endif -} - -void tst_QMouseEvent::qt3supportConstructors() -{ -#if !defined(QT3_SUPPORT) - QSKIP( "No Qt3Support present", SkipAll); -#else - // make sure the state() and stateAfter() functions return the - // same thing they did in Qt 3 when using these constructors - - { - QMouseEvent e(QEvent::MouseButtonPress, QPoint(0, 0), Qt::LeftButton, 0); - QCOMPARE(e.state(), Qt::ButtonState(Qt::NoButton)); - QCOMPARE(e.stateAfter(), Qt::ButtonState(Qt::LeftButton)); - } - - { - QMouseEvent e(QEvent::MouseButtonPress, QPoint(0, 0), QPoint(0, 0), Qt::LeftButton, 0); - QCOMPARE(e.state(), Qt::ButtonState(Qt::NoButton)); - QCOMPARE(e.stateAfter(), Qt::ButtonState(Qt::LeftButton)); - } -#endif } QTEST_MAIN(tst_QMouseEvent) diff --git a/tests/auto/qmutex/tst_qmutex.cpp b/tests/auto/qmutex/tst_qmutex.cpp index a8c4b37715..0f2d982843 100644 --- a/tests/auto/qmutex/tst_qmutex.cpp +++ b/tests/auto/qmutex/tst_qmutex.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include #include @@ -49,8 +48,6 @@ #include #include - - //TESTED_CLASS= //TESTED_FILES= @@ -372,14 +369,6 @@ public: } }; -#ifdef QT3_SUPPORT -#define VERIFY_LOCKED(x) QVERIFY((x).locked()) -#define VERIFY_NLOCKED(x) QVERIFY(!(x).locked()) -#else -#define VERIFY_LOCKED(x) -#define VERIFY_NLOCKED(x) -#endif // QT3_SUPPORT - void tst_QMutex::lock_unlock_locked_tryLock() { // normal mutex @@ -391,7 +380,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() for (int i = 0; i < iterations; ++i) { // normal mutex - VERIFY_NLOCKED(mutex); QVERIFY(mutex.tryLock()); mutex.unlock(); @@ -400,7 +388,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() for (int j = 0; j < iterations; ++j) { QVERIFY(thread.cond.wait(&thread.mutex, 10000)); - VERIFY_LOCKED(mutex); QVERIFY(!mutex.tryLock()); thread.cond.wakeOne(); @@ -409,13 +396,11 @@ void tst_QMutex::lock_unlock_locked_tryLock() thread.mutex.unlock(); QVERIFY(thread.wait(10000)); - VERIFY_NLOCKED(mutex); QVERIFY(mutex.tryLock()); mutex.unlock(); // recursive mutex - VERIFY_NLOCKED(rmutex); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); @@ -431,7 +416,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() for (int k = 0; k < iterations; ++k) { QVERIFY(rthread.cond.wait(&rthread.mutex, 10000)); - VERIFY_LOCKED(rmutex); QVERIFY(!rmutex.tryLock()); rthread.cond.wakeOne(); @@ -440,7 +424,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() rthread.mutex.unlock(); QVERIFY(rthread.wait(10000)); - VERIFY_NLOCKED(rmutex); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); @@ -462,6 +445,7 @@ public: static QBasicAtomicInt lockCount; static QBasicAtomicInt sentinel; static QMutex mutex; + static int errorCount; void start() { t.start(); @@ -471,13 +455,13 @@ public: { while (t.elapsed() < one_minute) { mutex.lock(); - Q_ASSERT(!sentinel.ref()); - Q_ASSERT(sentinel.deref()); + if (sentinel.ref()) ++errorCount; + if (!sentinel.deref()) ++errorCount; lockCount.ref(); mutex.unlock(); if (mutex.tryLock()) { - Q_ASSERT(!sentinel.ref()); - Q_ASSERT(sentinel.deref()); + if (sentinel.ref()) ++errorCount; + if (!sentinel.deref()) ++errorCount; lockCount.ref(); mutex.unlock(); } @@ -487,6 +471,7 @@ public: QMutex StressTestThread::mutex; QBasicAtomicInt StressTestThread::lockCount = Q_BASIC_ATOMIC_INITIALIZER(0); QBasicAtomicInt StressTestThread::sentinel = Q_BASIC_ATOMIC_INITIALIZER(-1); +int StressTestThread::errorCount = 0; void tst_QMutex::stressTest() { @@ -496,6 +481,7 @@ void tst_QMutex::stressTest() QVERIFY(threads[0].wait(one_minute + 10000)); for (int i = 1; i < threadCount; ++i) QVERIFY(threads[i].wait(10000)); + QCOMPARE(StressTestThread::errorCount, 0); qDebug("locked %d times", int(StressTestThread::lockCount)); } @@ -534,7 +520,12 @@ void tst_QMutex::tryLockRace() TryLockRaceThread::mutex.unlock(); } +// Variable that will be protected by the mutex. Volatile so that the +// the optimiser doesn't mess with it based on the increment-then-decrement +// usage pattern. static volatile int qtbug16115_trylock_counter; +// Counter for how many times the protected variable has an incorrect value. +static int qtbug16115_failure_count = 0; void tst_QMutex::qtbug16115_trylock() { @@ -545,8 +536,10 @@ void tst_QMutex::qtbug16115_trylock() void run() { for (int i = 0; i < 1000000; ++i) { if (mut.tryLock(0)) { - Q_ASSERT((++qtbug16115_trylock_counter) == 1); - Q_ASSERT((--qtbug16115_trylock_counter) == 0); + if ((++qtbug16115_trylock_counter) != 1) + ++qtbug16115_failure_count; + if ((--qtbug16115_trylock_counter) != 0) + ++qtbug16115_failure_count; mut.unlock(); } } @@ -562,13 +555,16 @@ void tst_QMutex::qtbug16115_trylock() for (int i = 0; i < 1000000; ++i) { mut.lock(); - Q_ASSERT((++qtbug16115_trylock_counter) == 1); - Q_ASSERT((--qtbug16115_trylock_counter) == 0); + if ((++qtbug16115_trylock_counter) != 1) + ++qtbug16115_failure_count; + if ((--qtbug16115_trylock_counter) != 0) + ++qtbug16115_failure_count; mut.unlock(); } t1.wait(); t2.wait(); t3.wait(); + QCOMPARE(qtbug16115_failure_count, 0); } QTEST_MAIN(tst_QMutex) diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp index f7c5ca151d..04bc410097 100644 --- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp +++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp @@ -65,9 +65,9 @@ class DownloadCheckWidget : public QWidget { Q_OBJECT public: - DownloadCheckWidget(QWidget *parent = 0) : QWidget(parent) - , progressDlg(this), netmanager(this) - , lateReadyRead(true) + DownloadCheckWidget(QWidget *parent = 0) : + QWidget(parent), lateReadyRead(true), zeroCopy(false), + progressDlg(this), netmanager(this) { progressDlg.setRange(1, 100); QMetaObject::invokeMethod(this, "go", Qt::QueuedConnection); @@ -96,12 +96,14 @@ public slots: void dataReadProgress(qint64 done, qint64 total) { QNetworkReply *reply = qobject_cast(sender()); + Q_UNUSED(reply); progressDlg.setMaximum(total); progressDlg.setValue(done); } void dataReadyRead() { QNetworkReply *reply = qobject_cast(sender()); + Q_UNUSED(reply); lateReadyRead = true; } void finishedFromReply() diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro index d1f6707f6f..d415e04451 100644 --- a/tests/auto/qnetworkreply/test/test.pro +++ b/tests/auto/qnetworkreply/test/test.pro @@ -13,7 +13,7 @@ win32 { !symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\" -QT = core network +QT = core-private network-private RESOURCES += ../qnetworkreply.qrc symbian|wince*:{ diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index d1dc62bbf4..258be2d1d7 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -219,6 +219,8 @@ private Q_SLOTS: void putGetDeleteGetFromHttp(); void sendCustomRequestToHttp_data(); void sendCustomRequestToHttp(); + void connectToIPv6Address_data(); + void connectToIPv6Address(); void ioGetFromData_data(); void ioGetFromData(); @@ -447,14 +449,19 @@ public: QSemaphore ready; bool doClose; bool doSsl; + bool ipv6; bool multiple; int totalConnections; - MiniHttpServer(const QByteArray &data, bool ssl = false, QThread *thread = 0) - : client(0), dataToTransmit(data), doClose(true), doSsl(ssl), + MiniHttpServer(const QByteArray &data, bool ssl = false, QThread *thread = 0, bool useipv6 = false) + : client(0), dataToTransmit(data), doClose(true), doSsl(ssl), ipv6(useipv6), multiple(false), totalConnections(0) { - listen(); + if( useipv6 ){ + listen(QHostAddress::AnyIPv6); + }else{ + listen(); + } if (thread) { connect(thread, SIGNAL(started()), this, SLOT(threadStartedSlot())); moveToThread(thread); @@ -466,7 +473,7 @@ public: protected: void incomingConnection(int socketDescriptor) { - //qDebug() << "incomingConnection" << socketDescriptor; + //qDebug() << "incomingConnection" << socketDescriptor << "doSsl:" << doSsl << "ipv6:" << ipv6; if (!doSsl) { client = new QTcpSocket; client->setSocketDescriptor(socketDescriptor); @@ -622,9 +629,14 @@ public: } QIODevice *prepare(const QNetworkCacheMetaData &) - { Q_ASSERT(0 && "Should not have tried to add to the cache"); return 0; } + { + qFatal("%s: Should not have tried to add to the cache", Q_FUNC_INFO); + return 0; + } void insert(QIODevice *) - { Q_ASSERT(0 && "Should not have tried to add to the cache"); } + { + qFatal("%s: Should not have tried to add to the cache", Q_FUNC_INFO); + } void clear() { cache.clear(); } }; @@ -774,7 +786,9 @@ public: QTcpSocket* waitForNextConnectionSocket() { waitForNewConnection(-1); if (doSsl) { - Q_ASSERT(sslSocket); + if (!sslSocket) + qFatal("%s: sslSocket should not be null after calling waitForNewConnection()", + Q_FUNC_INFO); return sslSocket; } else { //qDebug() << "returning nextPendingConnection"; @@ -946,7 +960,8 @@ protected: while (dataIndex < wantedSize) { const int remainingBytes = wantedSize - measuredSentBytes; const int bytesToWrite = qMin(remainingBytes, static_cast(BlockSize)); - Q_ASSERT(bytesToWrite); + if (bytesToWrite <= 0) + qFatal("%s: attempt to write %d bytes", Q_FUNC_INFO, bytesToWrite); measuredSentBytes += writeNextData(client, bytesToWrite); while (client->bytesToWrite() > 0) { @@ -1005,7 +1020,8 @@ public: // Wait for data to be readyRead bool ok = connect(&senderObj, SIGNAL(dataReady()), this, SLOT(slotDataReady())); - Q_ASSERT(ok); + if (!ok) + qFatal("%s: Cannot connect dataReady signal", Q_FUNC_INFO); } void wrapUp() @@ -1028,9 +1044,9 @@ protected: void timerEvent(QTimerEvent *) { //qDebug() << "RateControlledReader: timerEvent bytesAvailable=" << device->bytesAvailable(); - if (readBufferSize > 0) { - // This asserts passes all the time, except in the final flush. - //Q_ASSERT(device->bytesAvailable() <= readBufferSize); + if (readBufferSize > 0 && device->bytesAvailable() > readBufferSize) { + // This passes all the time, except in the final flush. + //qFatal("%s: Too many bytes available", Q_FUNC_INFO); } qint64 bytesRead = 0; @@ -1189,7 +1205,7 @@ QString tst_QNetworkReply::runSimpleRequest(QNetworkAccessManager::Operation op, break; default: - Q_ASSERT_X(false, "tst_QNetworkReply", "Invalid/unknown operation requested"); + qFatal("%s: Invalid/unknown operation requested", Q_FUNC_INFO); } reply->setParent(this); @@ -2317,6 +2333,48 @@ void tst_QNetworkReply::putGetDeleteGetFromHttp() } +void tst_QNetworkReply::connectToIPv6Address_data() +{ + QTest::addColumn("url"); + QTest::addColumn("error"); + QTest::addColumn("dataToSend"); + QTest::addColumn("serverVerifyData"); + QTest::newRow("localhost") << QUrl(QByteArray("http://[::1]")) << QNetworkReply::NoError<< QByteArray("localhost") << QByteArray("\r\nHost: [::1]\r\n"); + //to add more test data here +} + +void tst_QNetworkReply::connectToIPv6Address() +{ + QFETCH(QUrl, url); + QFETCH(QNetworkReply::NetworkError, error); + QFETCH(QByteArray, dataToSend); + QFETCH(QByteArray, serverVerifyData); + + QByteArray httpResponse = QByteArray("HTTP/1.0 200 OK\r\nContent-Length: "); + httpResponse += QByteArray::number(dataToSend.size()); + httpResponse += "\r\n\r\n"; + httpResponse += dataToSend; + + MiniHttpServer server(httpResponse, false, NULL/*thread*/, true/*useipv6*/); + server.doClose = true; + + url.setPort(server.serverPort()); + QNetworkRequest request(url); + + QNetworkReplyPtr reply = manager.get(request); + connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); + QTestEventLoop::instance().enterLoop(10); + QVERIFY(!QTestEventLoop::instance().timeout()); + QByteArray content = reply->readAll(); + if( !serverVerifyData.isEmpty()){ + //qDebug() << server.receivedData; + //QVERIFY(server.receivedData.contains(serverVerifyData)); //got a bug here + } + QVERIFY(content == dataToSend); + QCOMPARE(reply->url(), request.url()); + QVERIFY(reply->error() == error); +} + void tst_QNetworkReply::sendCustomRequestToHttp_data() { QTest::addColumn("url"); diff --git a/tests/auto/qobject/signalbug.cpp b/tests/auto/qobject/signalbug.cpp index f9c9650ef5..55ef5b3912 100644 --- a/tests/auto/qobject/signalbug.cpp +++ b/tests/auto/qobject/signalbug.cpp @@ -69,7 +69,8 @@ void Receiver::received () ::Step++; const int stepCopy = ::Step; TRACE (stepCopy, "Receiver::received()"); - Q_ASSERT (::Step == 2 || ::Step == 4); + if (::Step != 2 && ::Step != 4) + qFatal("%s: Incorrect Step: %d (should be 2 or 4)", Q_FUNC_INFO, ::Step); if (::Step == 2) s->fire (); @@ -91,7 +92,8 @@ void Disconnector::received () ::Step++; const int stepCopy = ::Step; TRACE (stepCopy, "Disconnector::received()"); - Q_ASSERT (::Step == 5 || ::Step == 6); + if (::Step != 5 && ::Step != 6) + qFatal("%s: Incorrect Step: %d (should be 5 or 6)", Q_FUNC_INFO, ::Step); fprintf (stderr, "Disconnector<%s>::received() sender=%s\n", (const char *) objectName ().toAscii (), sender ()->metaObject()->className()); @@ -124,7 +126,8 @@ void Sender::fire () ::Step++; const int stepCopy = ::Step; TRACE (stepCopy, "Sender::fire()"); - Q_ASSERT (::Step == 1 || ::Step == 3); + if (::Step != 1 && ::Step != 3) + qFatal("%s: Incorrect Step: %d (should be 1 or 3)", Q_FUNC_INFO, ::Step); emit fired (); TRACE (stepCopy, "ends Sender::fire()"); diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp index 4b926e450e..5e0b970f9b 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -40,10 +40,8 @@ ****************************************************************************/ -#define QT3_SUPPORT #include - #include #include @@ -403,6 +401,8 @@ public: } void reset() { + called_slot10 = 0; + called_slot9 = 0; called_slot8 = 0; called_slot7 = 0; called_slot6 = 0; @@ -421,6 +421,8 @@ public: int called_slot6; int called_slot7; int called_slot8; + int called_slot9; + int called_slot10; bool called(int slot) { switch (slot) { @@ -432,6 +434,8 @@ public: case 6: return called_slot6; case 7: return called_slot7; case 8: return called_slot8; + case 9: return called_slot9; + case 10: return called_slot10; default: return false; } } @@ -449,8 +453,8 @@ public slots: void slotLoopBack() { ++called_slot8; } protected slots: - void o() { Q_ASSERT(0); } - void on() { Q_ASSERT(0); } + void o() { ++called_slot9; } + void on() { ++called_slot10; } signals: void on_Sender_signalLoopBack(); @@ -473,6 +477,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalWithParams(0); @@ -484,6 +490,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalWithParams(0, "string"); @@ -495,6 +503,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalManyParams(1, 2, 3, "string", true); @@ -506,6 +516,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalManyParams2(1, 2, 3, "string", true); @@ -517,6 +529,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), true); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalLoopBack(); @@ -528,6 +542,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), true); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); } @@ -1312,14 +1328,16 @@ public: void customEvent(QEvent *) { - Q_ASSERT(customEventThread == 0); + if (customEventThread) + qFatal("%s: customEventThread should be null", Q_FUNC_INFO); customEventThread = QThread::currentThread(); emit theSignal(); } void timerEvent(QTimerEvent *) { - Q_ASSERT(timerEventThread == 0); + if (timerEventThread) + qFatal("%s: timerEventThread should be null", Q_FUNC_INFO); timerEventThread = QThread::currentThread(); emit theSignal(); } @@ -1327,7 +1345,8 @@ public: public slots: void theSlot() { - Q_ASSERT(slotThread == 0); + if (slotThread) + qFatal("%s: slotThread should be null", Q_FUNC_INFO); slotThread = QThread::currentThread(); emit theSignal(); } @@ -2813,11 +2832,6 @@ void tst_QObject::compatibilityChildInsertedEvents() expected = EventSpy::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&object, QEvent::ChildInsertedRequest) - << qMakePair(&object, QEvent::ChildInserted) - << qMakePair(&object, QEvent::ChildInserted) -#endif << qMakePair(&object, QEvent::Type(QEvent::User + 1)) << qMakePair(&object, QEvent::Type(QEvent::User + 2)); QCOMPARE(spy.eventList(), expected); @@ -2851,10 +2865,6 @@ void tst_QObject::compatibilityChildInsertedEvents() expected = EventSpy::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&object, QEvent::ChildInsertedRequest) - << qMakePair(&object, QEvent::ChildInserted) -#endif << qMakePair(&object, QEvent::Type(QEvent::User + 1)) << qMakePair(&object, QEvent::Type(QEvent::User + 2)); QCOMPARE(spy.eventList(), expected); diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro index e31fed5d10..29de071328 100644 --- a/tests/auto/qobject/tst_qobject.pro +++ b/tests/auto/qobject/tst_qobject.pro @@ -7,7 +7,8 @@ SOURCES += moc_oldnormalizeobject.cpp QT = core \ network \ - gui + gui \ + core-private wince*: { addFiles.files = signalbug.exe addFiles.path = . diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index 984443490f..25e58b41de 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -54,9 +54,6 @@ #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) #include #include -#ifdef QT3_SUPPORT -#include -#endif #endif #include #include @@ -1271,24 +1268,6 @@ void tst_QPainter::drawRect() QCOMPARE(painted.width(), rect.width() + increment); QCOMPARE(painted.height(), rect.height() + increment); } - -#ifdef QT3_SUPPORT - { - if (usePen && (rect.width() < 2 || rect.height() < 2)) - return; - pixmap.fill(Qt::white); - Q3Painter p(&pixmap); - p.setPen(usePen ? QPen(Qt::black) : QPen(Qt::NoPen)); - p.setBrush(Qt::black); - p.drawRect(rect); - p.end(); - - const QRect painted = getPaintedSize(pixmap, Qt::white); - - QCOMPARE(painted.width(), rect.width()); - QCOMPARE(painted.height(), rect.height()); - } -#endif } void tst_QPainter::drawRect2() @@ -1696,22 +1675,6 @@ void tst_QPainter::drawRoundRect() QCOMPARE(painted.width(), rect.width() + increment); QCOMPARE(painted.height(), rect.height() + increment); } - -#ifdef QT3_SUPPORT - { - pixmap.fill(Qt::white); - Q3Painter p(&pixmap); - p.setPen(usePen ? QPen(Qt::black) : QPen(Qt::NoPen)); - p.setBrush(Qt::black); - p.drawRoundRect(rect); - p.end(); - - const QRect painted = getPaintedSize(pixmap, Qt::white); - - QCOMPARE(painted.width(), rect.width()); - QCOMPARE(painted.height(), rect.height()); - } -#endif } Q_DECLARE_METATYPE(QImage::Format) diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/qpathclipper/qpathclipper.pro index 590fba0e2d..2becd7dd03 100644 --- a/tests/auto/qpathclipper/qpathclipper.pro +++ b/tests/auto/qpathclipper/qpathclipper.pro @@ -2,6 +2,7 @@ load(qttest_p4) INCLUDEPATH += . HEADERS += paths.h SOURCES += tst_qpathclipper.cpp paths.cpp +QT += gui-private requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/qpicture/tst_qpicture.cpp b/tests/auto/qpicture/tst_qpicture.cpp index 10a5a83aa1..1e97502abf 100644 --- a/tests/auto/qpicture/tst_qpicture.cpp +++ b/tests/auto/qpicture/tst_qpicture.cpp @@ -81,7 +81,7 @@ void tst_QPicture::getSetCheck() // void QPictureIO::setPicture(const QPicture &) // const char * QPictureIO::format() // void QPictureIO::setFormat(const char *) - char *var2 = "PNG"; + const char var2[] = "PNG"; obj1.setFormat(var2); QCOMPARE(var2, obj1.format()); obj1.setFormat((char *)0); @@ -90,7 +90,7 @@ void tst_QPicture::getSetCheck() // const char * QPictureIO::parameters() // void QPictureIO::setParameters(const char *) - char *var3 = "Bogus data"; + const char var3[] = "Bogus data"; obj1.setParameters(var3); QCOMPARE(var3, obj1.parameters()); obj1.setParameters((char *)0); diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 1f1ee88b23..216ca9b7c8 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -164,11 +164,6 @@ private slots: void copy(); void depthOfNullObjects(); -#ifdef QT3_SUPPORT - void resize(); - void resizePreserveMask(); -#endif - void transformed(); void transformed2(); @@ -1427,53 +1422,6 @@ void tst_QPixmap::copy() QVERIFY(pixmapsAreEqual(&trans, &transCopy)); } -#ifdef QT3_SUPPORT -void tst_QPixmap::resize() -{ - QPixmap p1(10, 10); - p1.fill(Qt::red); - - QPixmap p2 = p1; - QPixmap p3(50, 50); - p3.fill(Qt::red); - - p1.resize(p3.size()); - p1.resize(p2.size()); - p3.resize(p2.size()); - QCOMPARE(p1.toImage(), p2.toImage()); - QCOMPARE(p1.toImage(), p3.toImage()); - - QBitmap b1; - b1.resize(10, 10); - QVERIFY(b1.depth() == 1); - QPixmap p4; - p4.resize(10, 10); - QVERIFY(p4.depth() != 0); -} - -void tst_QPixmap::resizePreserveMask() -{ - QPixmap pm(100, 100); - pm.fill(Qt::transparent); - QPainter p(&pm); - p.fillRect(10, 10, 80, 80, Qt::red); - p.drawRect(0, 0, 99, 99); - p.end(); - - QBitmap mask = pm.mask(); - pm.resize(50, 50); - - QCOMPARE(pm.mask().toImage(), mask.toImage().copy(0, 0, 50, 50)); - - pm = QPixmap(100, 100); - pm.fill(Qt::red); - pm.setMask(mask); - pm.resize(50, 50); - - QCOMPARE(pm.mask().toImage(), mask.toImage().copy(0, 0, 50, 50)); -} -#endif - void tst_QPixmap::depthOfNullObjects() { QBitmap b1; @@ -1697,8 +1645,8 @@ void tst_QPixmap::fromImageReaderAnimatedGif() QImageReader referenceReader(path); QImageReader pixmapReader(path); - Q_ASSERT(referenceReader.canRead()); - Q_ASSERT(referenceReader.imageCount() > 1); + QVERIFY(referenceReader.canRead()); + QVERIFY(referenceReader.imageCount() > 1); for (int i = 0; i < referenceReader.imageCount(); ++i) { QImage refImage = referenceReader.read(); diff --git a/tests/auto/qpixmapcache/qpixmapcache.pro b/tests/auto/qpixmapcache/qpixmapcache.pro index c31f039548..1ffafd6c25 100644 --- a/tests/auto/qpixmapcache/qpixmapcache.pro +++ b/tests/auto/qpixmapcache/qpixmapcache.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += gui-private SOURCES += tst_qpixmapcache.cpp diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index 96765a478e..b1c4c4ee3c 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -39,19 +39,13 @@ ** ****************************************************************************/ - #include - - #include #include #include #include #include -#ifdef QT3_SUPPORT -#include -#endif #include #include #include @@ -412,6 +406,8 @@ void tst_QPrinter::testMargins() QFETCH(int, width); QFETCH(int, height); QFETCH(bool, fullpage); + Q_UNUSED(width); + Q_UNUSED(height); QPrinter printer; QPainter *painter = 0; printer.setOutputFileName("silly"); @@ -421,23 +417,6 @@ void tst_QPrinter::testMargins() if (withPainter) painter = new QPainter(&printer); -#ifdef QT3_SUPPORT - Q3PaintDeviceMetrics metrics(&printer); - int pwidth = metrics.width(); - int pheight = metrics.height(); - - if (orientation == QPrinter::Portrait) { - QVERIFY(pheight >= pwidth); - } else { - QVERIFY(pwidth >= pheight); - } - - if (fullpage) { - QCOMPARE(metrics.widthMM(), width); - QCOMPARE(metrics.heightMM(), height); - } -#endif - if (painter) delete painter; } diff --git a/tests/auto/qprocess/testGuiProcess/main.cpp b/tests/auto/qprocess/testGuiProcess/main.cpp index 5550772dab..1df5dcf3e1 100644 --- a/tests/auto/qprocess/testGuiProcess/main.cpp +++ b/tests/auto/qprocess/testGuiProcess/main.cpp @@ -49,6 +49,7 @@ int main(int argc, char **argv) label.show(); int c; + Q_UNUSED(c); fgetc(stdin); // block until fed qDebug("Process is running"); diff --git a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp index c6ea8cacd7..0652ddf0a2 100644 --- a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp +++ b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char ** argv) for (int i = 0; i < argc; ++i) { if (i) printf("|"); - printf(argv[i]); + printf("%s", argv[i]); } #endif return 0; diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index 2a8874eab3..3e0c3ff412 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -668,7 +668,7 @@ void tst_QProcess::exitStatus() QSKIP("This test opens a crash dialog on Windows", SkipSingle); #endif - Q_ASSERT(processList.count() == exitStatus.count()); + QCOMPARE(exitStatus.count(), processList.count()); for (int i = 0; i < processList.count(); ++i) { process->start(processList.at(i)); QVERIFY(process->waitForStarted(5000)); diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp index e0cc2fa200..0d575a13d9 100644 --- a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp @@ -362,34 +362,45 @@ void tst_QReadWriteLock::tryWriteLock() class Thread : public QThread { public: + Thread() : failureCount(0) { } void run() { testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(!readWriteLock.tryLockForWrite()); + if (readWriteLock.tryLockForWrite()) + failureCount++; testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(readWriteLock.tryLockForWrite()); - Q_ASSERT(lockCount.testAndSetRelaxed(0, 1)); - Q_ASSERT(lockCount.testAndSetRelaxed(1, 0)); + if (!readWriteLock.tryLockForWrite()) + failureCount++; + if (!lockCount.testAndSetRelaxed(0, 1)) + failureCount++; + if (!lockCount.testAndSetRelaxed(1, 0)) + failureCount++; readWriteLock.unlock(); testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(!readWriteLock.tryLockForWrite(1000)); + if (readWriteLock.tryLockForWrite(1000)) + failureCount++; testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(readWriteLock.tryLockForWrite(1000)); - Q_ASSERT(lockCount.testAndSetRelaxed(0, 1)); - Q_ASSERT(lockCount.testAndSetRelaxed(1, 0)); + if (!readWriteLock.tryLockForWrite(1000)) + failureCount++; + if (!lockCount.testAndSetRelaxed(0, 1)) + failureCount++; + if (!lockCount.testAndSetRelaxed(1, 0)) + failureCount++; readWriteLock.unlock(); testsTurn.release(); threadsTurn.acquire(); } + + int failureCount; }; Thread thread; @@ -419,6 +430,8 @@ void tst_QReadWriteLock::tryWriteLock() testsTurn.acquire(); threadsTurn.release(); thread.wait(); + + QCOMPARE(thread.failureCount, 0); } } diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 8974b2576b..bd16aad8f8 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -101,7 +101,6 @@ private slots: void testArrays_data(); void testArrays(); void testEscapes(); - void testCompatFunctions(); void testCaseSensitivity_data(); void testCaseSensitivity(); void testErrorHandling_data(); @@ -136,52 +135,11 @@ private slots: void qtbug_13249(); #endif - /* - These tests were developed for the Qt 3 QSettings class. - */ -#ifdef QT3_SUPPORT - void oldWriteEntryIni_data(); - void oldWriteEntryIni(); - void oldReadEntryIni_data(); - void oldReadEntryIni(); - void oldBeginGroup_data(); - void oldBeginGroup(); - void oldEndGroup_data(); - void oldEndGroup(); - void oldResetGroup_data(); - void oldResetGroup(); - void oldEntryList_data(); - void oldEntryList(); - void oldWriteEntry_QString_bool_data(); - void oldWriteEntry_QString_bool(); - void oldWriteEntry_QString_double_data(); - void oldWriteEntry_QString_double(); - void oldWriteEntry_QString_int_data(); - void oldWriteEntry_QString_int(); - void oldWriteEntry_QString_QString_data(); - void oldWriteEntry_QString_QString(); - void oldWriteEntry_QString_QStringList_data(); - void oldWriteEntry_QString_QStringList(); - void oldWriteEntry_QString_QStringList_QChar_data(); - void oldWriteEntry_QString_QStringList_QChar(); - void oldReadListEntry_QString(); - void oldReadListEntry_QString_QChar(); - void oldReadEntry(); - void oldReadNumEntry(); - void oldReadDoubleEntry(); - void oldReadBoolEntry(); - void oldGlobalVersusLocal(); - void oldRemoveEntry(); -#endif - void testVariantTypes_data(); void testVariantTypes(); void rainersSyncBugOnMac_data(); void rainersSyncBugOnMac(); void recursionBug(); -#ifdef QT3_SUPPORT - void setPathBug(); -#endif void testByteArray_data(); void testByteArray(); @@ -2529,104 +2487,6 @@ void tst_QSettings::testEscapes() #endif } -void tst_QSettings::testCompatFunctions() -{ -#ifdef QT3_SUPPORT - QSettings settings1("software.org", "KillerAPP"); - - bool ok; - ok = settings1.writeEntry("/root/bool", true); - QVERIFY(ok); - ok = settings1.writeEntry("/root/double", 1.4); - QVERIFY(ok); - ok = settings1.writeEntry("/root/int", 66666); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */1", "Hello"); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */2", ""); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */3", (const char *)0); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/1", QString("Hello")); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/2", QString("")); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/3", QString()); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/1", QStringList()); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/2", QStringList() << ""); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/3", QStringList() << "a" << "" << "b"); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/4", QStringList() << "a" << "" << "b", ':'); - QVERIFY(ok); - - QCOMPARE(settings1.readBoolEntry("/root/bool"), true); - QCOMPARE(settings1.readDoubleEntry("/root/double"), 1.4); - QCOMPARE(settings1.readNumEntry("/root/int"), 66666); - QCOMPARE(settings1.readEntry("/root/const char */1"), QString("Hello")); - QCOMPARE(settings1.readEntry("/root/const char */2"), QString("")); - QCOMPARE(settings1.readEntry("/root/const char */3"), QString()); - QCOMPARE(settings1.readEntry("/root/QString/1"), QString("Hello")); - QCOMPARE(settings1.readEntry("/root/QString/2"), QString("")); - QCOMPARE(settings1.readEntry("/root/QString/3"), QString()); - QCOMPARE(settings1.readListEntry("/root/QStringList/1"), QStringList()); - QCOMPARE(settings1.readListEntry("/root/QStringList/2"), QStringList() << ""); - QCOMPARE(settings1.readListEntry("/root/QStringList/3"), QStringList() << "a" << "" << "b"); - QCOMPARE(settings1.readListEntry("/root/QStringList/4", ':'), QStringList() << "a" << "" << "b"); - QCOMPARE(settings1.readEntry("/root/QStringList/4"), QString("a::b")); - - QStringList actual, expectedSubKey, expectedEntry; - - settings1.clear(); - QStringList initialKeys = settings1.allKeys(); - settings1.setValue("/alpha/beta", 5); - settings1.setValue("/alpha/beta/gamma", 5); - settings1.setValue("/alpha/beta/delta", 5); - settings1.setValue("/alpha/epsilon/zeta/eta", 5); - settings1.setValue("/alpha/theta", 5); - - settings1.beginGroup("/alpha"); - QCOMPARE(settings1.group(), QString("alpha")); - - actual = settings1.entryList(""); - actual.sort(); - expectedEntry = QStringList() << "beta" << "theta"; - QCOMPARE(actual, expectedEntry); - - actual = settings1.subkeyList(""); - actual.sort(); - expectedSubKey = QStringList() << "beta" << "epsilon"; - QCOMPARE(actual, expectedSubKey); - - settings1.endGroup(); - - actual = settings1.entryList("alpha"); - actual.sort(); - QCOMPARE(actual, expectedEntry); - - actual = settings1.subkeyList("alpha"); - actual.sort(); - QCOMPARE(actual, expectedSubKey); - - actual = settings1.entryList(""); - QVERIFY(containsSubList(initialKeys, actual)); - - actual = settings1.subkeyList(""); - QVERIFY(actual.contains("alpha")); - - actual = settings1.subkeyList("foo/bar/baz"); - QVERIFY(actual.isEmpty()); - - actual = settings1.subkeyList("alpha/epsilon"); - expectedSubKey = QStringList() << "zeta"; - QCOMPARE(actual, expectedSubKey); -#else - QSKIP("Compiled without Qt3Support", SkipAll); -#endif -} - void tst_QSettings::testCaseSensitivity_data() { populateWithFormats(); @@ -2711,550 +2571,6 @@ void tst_QSettings::testCaseSensitivity() } } -#ifdef QT3_SUPPORT -void tst_QSettings::oldEntryList_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldReadEntryIni_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldWriteEntryIni_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldReadEntry_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldWriteEntry_data() -{ - // define the test elements we're going to use - QTest::addColumn("string"); - QTest::addColumn("empty"); - QTest::addColumn("unicode"); - QTest::addColumn("integer"); - QTest::addColumn("boolean"); - QTest::addColumn("floating"); - QTest::addColumn("list"); - - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data0") << QString("blah") << QString("") << QString( QChar(0x0E12) ) << 99 << TRUE << 3.1415 << list0; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << QString(); - list1 << ""; - list1 << "elem3"; - QTest::newRow( "data1") << QString("foo") << QString("") << QString( QChar(0xFEFC) ) << -150 << FALSE << 0.0 << list1; -} - -void tst_QSettings::oldWriteEntryHelper( QSettings &settings ) -{ - QFETCH( QString, string ); - QFETCH( QString, empty ); - QFETCH( QString, unicode ); - QFETCH( int, integer ); - QFETCH( bool, boolean ); - QFETCH( double, floating ); - QFETCH( QStringList, list ); - - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting", string ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/String", string ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Empty", empty ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Unicode", unicode ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Integer", integer ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Boolean", boolean ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Floating", floating ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/List", list ) ); -} - -void tst_QSettings::oldReadEntryHelper( QSettings &settings ) -{ - bool ok; - - QFETCH( QString, string ); - QFETCH( QString, empty ); - QFETCH( QString, unicode ); - QFETCH( int, integer ); - QFETCH( bool, boolean ); - QFETCH( double, floating ); - QFETCH( QStringList, list ); - - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting", QString::null, &ok ), string ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/String", QString::null, &ok ), string ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/Empty", QString::null, &ok ), empty ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/Unicode", QString::null, &ok ), unicode ); - QVERIFY( ok ); - QCOMPARE( settings.readNumEntry( "/Trolltech/QSettingsTesting/Integer", 0, &ok ), integer ); - QVERIFY( ok ); - QCOMPARE( settings.readBoolEntry( "/Trolltech/QSettingsTesting/Boolean", 0, &ok ), boolean ); - QVERIFY( ok ); - QCOMPARE( settings.readDoubleEntry( "/Trolltech/QSettingsTesting/Floating", 0, &ok ), floating ); - QVERIFY( ok ); - QCOMPARE( settings.readListEntry( "/Trolltech/QSettingsTesting/List", &ok ), list ); - QVERIFY( ok ); - - settings.readListEntry( "/Trolltech/QSettingsTesting/NonExistingValue", &ok ); - QVERIFY( !ok ); -} - -void tst_QSettings::oldWriteEntryIni() -{ - QSettings settings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldWriteEntryHelper(settings); -} - -void tst_QSettings::oldReadEntryIni() -{ - { - QSettings writeSettings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldWriteEntryHelper( writeSettings ); - } - { - QSettings readSettings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldReadEntryHelper( readSettings ); - } -} - - -void tst_QSettings::oldEndGroup_data() -{ - oldBeginGroup_data(); -} - -void tst_QSettings::oldResetGroup_data() -{ - oldBeginGroup_data(); -} - -void tst_QSettings::oldBeginGroup_data() -{ - // define the test elements we're going to use - QTest::addColumn("group"); - QTest::addColumn("value"); - - QTest::newRow( "data0") << QString("blah") << "value"; - QTest::newRow( "data1") << QString("") << "first/value"; - QTest::newRow( "data2") << QString("first/second") << "value"; - QTest::newRow( "data3") << QString("first/second/third") << "value"; - QTest::newRow( "data4") << QString("first/second/third") << "value"; -} - -void tst_QSettings::oldBeginGroup() -{ - bool ok; - - QFETCH( QString, group ); - QFETCH( QString, value ); - - QSettings settings("software.org", "KillerAPP"); - - QCOMPARE(settings.group(), QString()); - settings.beginGroup( group ); - QCOMPARE(settings.group(), group); - - QVERIFY( settings.writeEntry( "/" + value, value ) ); - QCOMPARE( settings.readEntry( "/" + value ), value ); - settings.endGroup(); - QCOMPARE( settings.readEntry( group + "/" + value, QString::null, &ok ), value ); - QVERIFY( ok ); -} - -void tst_QSettings::oldEndGroup() -{ - QFETCH( QString, group ); - - QSettings settings("software.org", "KillerAPP"); - QCOMPARE( settings.group(), QString() ); - - settings.beginGroup( group ); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); - - settings.beginGroup( group ); - settings.beginGroup( group ); - settings.endGroup(); - QCOMPARE( settings.group(), group ); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); - - QTest::ignoreMessage(QtWarningMsg, "QSettings::endGroup: No matching beginGroup()"); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); -} - -void tst_QSettings::oldResetGroup() -{ - QFETCH( QString, group ); - - QSettings settings("software.org", "KillerAPP"); - settings.beginGroup( group ); - - settings.resetGroup(); - QCOMPARE( settings.group(), QString() ); -} - -void tst_QSettings::oldEntryList() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - oldWriteEntryHelper( writeSettings ); - } - - QStringList entryKeys; - entryKeys << "String" << "Empty" << "Unicode" << "Integer" << "Boolean" << "Floating" << "List"; - - QSettings readSettings("software.org", "KillerAPP"); - QStringList entryList = readSettings.entryList( "/Trolltech/QSettingsTesting/" ); - entryKeys.sort(); - entryList.sort(); - QCOMPARE( entryKeys, entryList ); -} - -void tst_QSettings::oldWriteEntry_QString_bool_data() -{ - QTest::addColumn("b"); - QTest::newRow( "false" ) << bool(FALSE); - QTest::newRow( "true" ) << bool(TRUE); -} - -void tst_QSettings::oldWriteEntry_QString_bool() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( bool, b ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Boolean", b ) ); - } - - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( bool, b ); - bool ok = FALSE; - QCOMPARE( readSettings.readBoolEntry( "/Trolltech/QSettingsTesting/Boolean", 0, &ok ), b ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_double_data() -{ - QTest::addColumn("f"); - QTest::newRow( "data0" ) << 3.1415; - QTest::newRow( "data1" ) << 0.0; - QTest::newRow( "data2" ) << 0.0000000000000000000000000001; -} - -void tst_QSettings::oldWriteEntry_QString_double() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( double, f ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Floating", f ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( double, f ); - bool ok = FALSE; - QCOMPARE( readSettings.readDoubleEntry( "/Trolltech/QSettingsTesting/Floating", 0, &ok ), f ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_int_data() -{ - QTest::addColumn("i"); - QTest::newRow( "data0" ) << int(0); - QTest::newRow( "data1" ) << int(1); - QTest::newRow( "data2" ) << int(11); - QTest::newRow( "data3" ) << int(111); - QTest::newRow( "data4" ) << int(1111); - QTest::newRow( "data5" ) << int(11111); - QTest::newRow( "data6" ) << int(-1); - QTest::newRow( "data7" ) << int(-11); - QTest::newRow( "data8" ) << int(-111); - QTest::newRow( "data9" ) << int(-1111); - QTest::newRow( "data10" ) << int(-11111); -} - -void tst_QSettings::oldWriteEntry_QString_int() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( int, i ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Integer", i ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( int, i ); - bool ok = FALSE; - QCOMPARE( readSettings.readNumEntry( "/Trolltech/QSettingsTesting/Integer", 0, &ok ), i ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QString_data() -{ - QTest::addColumn("s"); - QTest::newRow( "data0" ) << QString( "blah" ); - QTest::newRow( "data1" ) << QString( "" ); - QTest::newRow( "data2" ) << QString( QChar(0x0E12) ); // unicode - QTest::newRow( "data3" ) << QString("foo"); -// QTest::newRow( "data4" ) << QString::null; // nul string (not supported on Windows!) - QTest::newRow( "data5" ) << QString( QChar(0xFEFC) ); // more unicode - QTest::newRow( "data6" ) << QString( "This is s short string" ); - QTest::newRow( "data7" ) << QString( "This is a string with a cr\nand some text on the second line" ); - QTest::newRow( "data8" ) << QString( "\n" ); - QTest::newRow( "data9" ) << QString( "01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_+=-[{]}\\|'\":;/?.>,<" ); -} - -void tst_QSettings::oldWriteEntry_QString_QString() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QString, s ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/String", s ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QString, s ); - bool ok = FALSE; - QCOMPARE( readSettings.readEntry( "/Trolltech/QSettingsTesting/String", QString::null, &ok ), s ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_data() -{ - QTest::addColumn("l"); - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data0") << list0; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << QString(); - list1 << ""; - list1 << "elem3"; - QTest::newRow( "data1") << list1; - - QStringList list2; - list2 << " elem1"; - list2 << "elem2 bla bla bla, yada yada, 01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_+=-[{]}\\|'\":;/?.>,<"; - list1 << QString(); - list2 << "\n"; - list2 << "elem3\nand another line"; - QTest::newRow( "data2") << list2; -} - -void tst_QSettings::oldWriteEntry_QString_QStringList() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/List", l ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - bool ok = FALSE; - QCOMPARE( readSettings.readListEntry( "/Trolltech/QSettingsTesting/List", &ok ), l ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_QChar_data() -{ - QTest::addColumn("l"); - QTest::addColumn("sep"); - - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data00") << list0 << "\\"; - QTest::newRow( "data01") << list0 << "/"; - QTest::newRow( "data02") << list0 << " "; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << "elem3"; - QTest::newRow( "data10") << list1 << "\\"; - QTest::newRow( "data11") << list1 << "/"; - QTest::newRow( "data12") << list1 << "&"; - - QStringList list2; - list2 << " elem1"; - list2 << "elem2 bla bla bla, yada yada, 01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^*()_+=-[{]}\\|/'\":;?.>,<"; - list2 << "\n"; - list2 << "elem3\nand another line"; - QTest::newRow( "data20") << list2 << "&"; - - // an empty stringlist should be stored as an empty string (and return an empty stringlist?) - QStringList list3; - QTest::newRow( "data30") << list3 << "/"; -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_QChar() -{ - // edba: - // data10, data11, data12, data20, data21 and data22 currently fail. - // This is because the list DOES contain the separator which is a fail IMO, so i - // expect the writeEntry to return FALSE (but it doesn't). - // If my interpretation of the doc is wrong, then the separators should be deleted from - // data10 .. data22. - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QFETCH( QString, sep ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/List", l, QChar(sep[0]) ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QFETCH( QString, sep ); - bool ok = FALSE; - QStringList actual; - actual = readSettings.readListEntry( "/Trolltech/QSettingsTesting/List", QChar(sep[0]), &ok ); - QVERIFY2( ok, "Read the stringlist from the settings" ); - QCOMPARE( actual, l ); - } -} - -void tst_QSettings::oldReadListEntry_QString() -{ - DEPENDS_ON( "writeEntry_QString_QStringList" ); -} - -void tst_QSettings::oldReadListEntry_QString_QChar() -{ - DEPENDS_ON( "writeEntry_QString_QStringList_QChar" ); -} - -void tst_QSettings::oldReadEntry() -{ - DEPENDS_ON( "writeEntry_QString_QString" ); -} - -void tst_QSettings::oldReadNumEntry() -{ - DEPENDS_ON( "writeEntry_QString_int" ); -} - -void tst_QSettings::oldReadDoubleEntry() -{ - DEPENDS_ON( "writeEntry_QString_double" ); -} - -void tst_QSettings::oldReadBoolEntry() -{ - DEPENDS_ON( "writeEntry_QString_bool" ); -} - -void tst_QSettings::oldRemoveEntry() -{ - // we'll use this one later - QSettings firstSettings("software.org", "KillerAPP"); - - // first write a key - { - QSettings writeSettings("software.org", "KillerAPP"); - writeSettings.writeEntry( "/Trolltech/QSettingsTesting/removeEntry", "foobar" ); - } - - // check that the key exists - { - QSettings readSettings("software.org", "KillerAPP"); - bool ok = FALSE; - QString foo = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok ); - QVERIFY( foo == "foobar" ); - - // and remove it - QVERIFY( readSettings.removeEntry( "/Trolltech/QSettingsTesting/removeEntry") ); - - // check that it is gone - QString foo2 = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo2 == "" ); - } - - // Take another chance with a fresh instance - { - QSettings readSettings("software.org", "KillerAPP"); - bool ok = FALSE; - QString foo = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo == "" ); - } - - // and another chance with an instance that existed already - { - bool ok = FALSE; - QString foo = firstSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo == "" ); - } -} - -void tst_QSettings::oldGlobalVersusLocal() -{ - { //write global - QSettings settings("foo"); - settings.setPath("software.org", "KillerAPP", QSettings::Global); - settings.writeEntry("/vs/just_global/", "from Global"); - settings.writeEntry("/vs/local_and_global/", "from Global"); - } - { //write local - QSettings settings("bar"); - settings.setPath("software.org", "KillerAPP", QSettings::User); - settings.writeEntry("/vs/local_and_global/", "from User"); - } - bool ok; - { - QSettings settings("baz"); - settings.setPath("software.org", "KillerAPP", QSettings::User); - QString just_global = settings.readEntry("/vs/just_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(just_global, QString("from Global")); - QString local_and_global = settings.readEntry("/vs/local_and_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(local_and_global, QString("from User")); - } - { - QSettings settings("bat"); - settings.setPath("software.org", "KillerAPP", QSettings::Global); - QString just_global = settings.readEntry("/vs/just_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(just_global, QString("from Global")); - QString local_and_global = settings.readEntry("/vs/local_and_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(local_and_global, QString("from Global")); - } -} -#endif // QT3_SUPPORT - void tst_QSettings::fileName() { #ifdef Q_OS_MAC @@ -3792,19 +3108,6 @@ void tst_QSettings::recursionBug() } } -#ifdef QT3_SUPPORT -void tst_QSettings::setPathBug() -{ - QSettings settings("software.org", "KillerAPP", this); - settings.setPath("foo.org", "Bar", QSettings::User); - QVERIFY(settings.parent() == this); - settings.setValue("blah", "BAZ"); - settings.setPath("bar.org", "Baz", QSettings::User); - settings.setValue("blah", "BAZ"); - QVERIFY(settings.parent() == this); -} -#endif - #if defined(Q_OS_WIN) static DWORD readKeyType(HKEY handle, const QString &rSubKey) diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp index 1ba03dced6..9999d9a9bc 100644 --- a/tests/auto/qsharedpointer/externaltests.cpp +++ b/tests/auto/qsharedpointer/externaltests.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #ifdef Q_OS_SYMBIAN #define DEFAULT_MAKESPEC "X:/STLsupport/mkspecs/symbian-abld/" @@ -342,7 +343,8 @@ namespace QTest { void QExternalTestPrivate::removeTemporaryDirectory() { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; removeRecursive(temporaryDir); temporaryDir.clear(); } @@ -369,8 +371,6 @@ namespace QTest { sourceCode += "#include \n"; if (qtModules & QExternalTest::QtSql) sourceCode += "#include \n"; - if (qtModules & QExternalTest::Qt3Support) - sourceCode += "#include \n"; if (qtModules & QExternalTest::QtSvg) sourceCode += "#include \n"; if (qtModules & QExternalTest::QtScript) @@ -487,7 +487,8 @@ namespace QTest { bool QExternalTestPrivate::createProjectFile() { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; QFile projectFile(temporaryDir + QLatin1String("/project.pro")); if (!projectFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { @@ -540,8 +541,6 @@ namespace QTest { projectFile.write("QT += opengl\n"); if (qtModules & QExternalTest::QtSql) projectFile.write("QT += sql\n"); - if (qtModules & QExternalTest::Qt3Support) - projectFile.write("QT += qt3support\n"); if (qtModules & QExternalTest::QtSvg) projectFile.write("QT += svg\n"); if (qtModules & QExternalTest::QtScript) @@ -599,7 +598,9 @@ namespace QTest { bool QExternalTestPrivate::runQmake() { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; + if (!createProjectFile()) return false; @@ -633,7 +634,8 @@ namespace QTest { bool QExternalTestPrivate::runMake(Target target) { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; QExternalProcess make; make.setWorkingDirectory(temporaryDir); diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h index ca20cb0c30..1bf642abb6 100644 --- a/tests/auto/qsharedpointer/externaltests.h +++ b/tests/auto/qsharedpointer/externaltests.h @@ -72,13 +72,12 @@ namespace QTest { QtXmlPatterns=0x0010, QtOpenGL = 0x0020, QtSql = 0x0040, - Qt3Support = 0x0080, - QtSvg = 0x0100, - QtScript = 0x0200, - QtTest = 0x0400, - QtDBus = 0x0800, - QtWebKit = 0x1000, - Phonon = 0x2000 // odd man out + QtSvg = 0x0080, + QtScript = 0x0100, + QtTest = 0x0200, + QtDBus = 0x0400, + QtWebKit = 0x0800, + Phonon = 0x1000 // odd man out }; Q_DECLARE_FLAGS(QtModules, QtModule) diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index bb04621b67..62502193b2 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -139,7 +139,8 @@ public: virtual ~Data() { - Q_ASSERT_X(generation > 0, "tst_QSharedPointer", "Double deletion!"); + if (generation <= 0) + qFatal("tst_qsharedpointer: Double deletion!"); generation = 0; ++destructorCounter; } @@ -283,8 +284,8 @@ void tst_QSharedPointer::operators() QSharedPointer p1; QSharedPointer p2(new char); qptrdiff diff = p2.data() - p1.data(); - Q_ASSERT(p1.data() != p2.data()); - Q_ASSERT(diff != 0); + QVERIFY(p1.data() != p2.data()); + QVERIFY(diff != 0); // operator- QCOMPARE(p2 - p1.data(), diff); @@ -867,8 +868,8 @@ void tst_QSharedPointer::differentPointers() { DiffPtrDerivedData *aData = new DiffPtrDerivedData; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); QSharedPointer baseptr = QSharedPointer(aData); QSharedPointer ptr = qSharedPointerCast(baseptr); @@ -885,8 +886,8 @@ void tst_QSharedPointer::differentPointers() { DiffPtrDerivedData *aData = new DiffPtrDerivedData; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); QSharedPointer ptr = QSharedPointer(aData); QSharedPointer baseptr = ptr; @@ -908,8 +909,8 @@ void tst_QSharedPointer::virtualBaseDifferentPointers() { VirtualDerived *aData = new VirtualDerived; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); QSharedPointer ptr = QSharedPointer(aData); QSharedPointer baseptr = qSharedPointerCast(ptr); @@ -928,8 +929,8 @@ void tst_QSharedPointer::virtualBaseDifferentPointers() { VirtualDerived *aData = new VirtualDerived; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast(&aData) != *reinterpret_cast(&aBase)); QSharedPointer ptr = QSharedPointer(aData); QSharedPointer baseptr = ptr; @@ -1605,7 +1606,7 @@ void hashAndMapTest() QVERIFY(it != c.find(Key())); if (Ordered) { - Q_ASSERT(k0 < k1); + QVERIFY(k0 < k1); it = c.begin(); QCOMPARE(it.key(), k0); diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro index 91a2137f2c..3ace4fe8a5 100644 --- a/tests/auto/qsidebar/qsidebar.pro +++ b/tests/auto/qsidebar/qsidebar.pro @@ -1,5 +1,6 @@ CONFIG += qttest_p4 +QT += core-private SOURCES += tst_qsidebar.cpp TARGET = tst_qsidebar diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/qsocketnotifier/qsocketnotifier.pro index 27484c89f7..c0fdc6a9b3 100644 --- a/tests/auto/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/qsocketnotifier/qsocketnotifier.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qsocketnotifier.cpp -QT = core network +QT = core-private network-private requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp index f966e7fec0..2537a6cc26 100644 --- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp +++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp @@ -57,7 +57,7 @@ #include #endif #include -#include +#include class tst_QSocketNotifier : public QObject { @@ -180,7 +180,7 @@ void tst_QSocketNotifier::unexpectedDisconnection() // we have to wait until sequence value changes // as any event can make us jump out processing QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); - QVERIFY(timer.isActive); //escape if test would hang + QVERIFY(timer.isActive()); //escape if test would hang } while(tester.sequence <= 0); QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState); diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro index c82c62d3e8..3a144aeacf 100644 --- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro @@ -7,7 +7,7 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core network +QT = core-private network-private # Symbian toolchain does not support correct include semantics symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 8e7f39335c..3250c0e9f0 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -3193,7 +3193,7 @@ public: } protected: - bool filterAcceptsColumn(int column, const QModelIndex &source_parent) const + bool filterAcceptsColumn(int column, const QModelIndex & /* source_parent */) const { return column % 2 != 0; } diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp index 0482661515..84db2c20a6 100644 --- a/tests/auto/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/qsplitter/tst_qsplitter.cpp @@ -81,8 +81,6 @@ public slots: private slots: void getSetCheck(); void sizes(); // bare (as in empty) - void setSizes3(); - void setSizes3_data(); void setSizes(); void setSizes_data(); void saveAndRestoreState(); @@ -147,9 +145,6 @@ void tst_QSplitter::initTestCase() w2 = new QWidget; splitter->addWidget(w1); splitter->addWidget(w2); -#if defined(QT3_SUPPORT) - qApp->setMainWidget(splitter); -#endif } void tst_QSplitter::init() @@ -183,16 +178,13 @@ void tst_QSplitter::addThirdWidget() void tst_QSplitter::cleanupTestCase() { -#if defined(QT3_SUPPORT) - delete qApp->mainWidget(); -#endif } typedef QList IntList; Q_DECLARE_METATYPE(IntList) -void tst_QSplitter::setSizes3() +void tst_QSplitter::setSizes() { QFETCH(IntList, minimumSizes); QFETCH(IntList, splitterSizes); @@ -212,7 +204,7 @@ void tst_QSplitter::setSizes3() QTEST(splitter->sizes(), "expectedSizes"); } -void tst_QSplitter::setSizes3_data() +void tst_QSplitter::setSizes_data() { QTest::addColumn("minimumSizes"); QTest::addColumn("splitterSizes"); @@ -255,653 +247,6 @@ void tst_QSplitter::setSizes3_data() } } -void tst_QSplitter::setSizes() -{ -#if !defined(QT3_SUPPORT) - QSKIP("No Qt3Support", SkipAll); -#else - QFETCH(int, minSize1); - QFETCH(int, minSize2); - QFETCH(int, splitterSize1); - QFETCH(int, splitterSize2); - QFETCH(bool, collapse1); - QFETCH(bool, collapse2); - QFETCH(bool, childrencollapse); - QFETCH(int, resizeMode1); - QFETCH(int, resizeMode2); - QList mySizes; - mySizes << splitterSize1 << splitterSize2; - w1->setMinimumWidth(minSize1); - w2->setMinimumWidth(minSize2); - splitter->setCollapsible(w1, collapse1); - splitter->setCollapsible(w2, collapse2); - splitter->setChildrenCollapsible(childrencollapse); - splitter->setResizeMode(w1, (QSplitter::ResizeMode)resizeMode1); - splitter->setResizeMode(w2, (QSplitter::ResizeMode)resizeMode2); - splitter->setSizes(mySizes); - mySizes = splitter->sizes(); - QTEST(mySizes[0], "expected1"); - QTEST(mySizes[1], "expected2"); -#endif -} - -void tst_QSplitter::setSizes_data() -{ -#if defined(QT3_SUPPORT) - QTest::addColumn("minSize1"); - QTest::addColumn("minSize2"); - QTest::addColumn("splitterSize1"); - QTest::addColumn("splitterSize2"); - QTest::addColumn("expected1"); - QTest::addColumn("expected2"); - QTest::addColumn("collapse1"); - QTest::addColumn("collapse2"); - QTest::addColumn("childrencollapse"); - QTest::addColumn("resizeMode1"); - QTest::addColumn("resizeMode2"); - QTest::newRow("ok00") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok01") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok02") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok03") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok04") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok05") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok06") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok07") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok08") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok09") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok10") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - - QTest::newRow("ok20") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok21") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok22") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok23") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok24") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok25") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok26") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok27") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok28") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok29") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok30") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok40") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok41") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok42") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok43") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok44") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok45") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok46") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok47") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok48") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok49") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok50") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - - QTest::newRow("ok60") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok61") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok62") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok63") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok64") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok65") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok66") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok67") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok68") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok69") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok70") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - - QTest::newRow("ok80") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok81") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok82") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok83") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok84") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok85") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok86") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok87") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok88") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok89") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok90") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - - QTest::newRow("ok100") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok101") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok102") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok103") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok104") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok105") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok106") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok107") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok108") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok109") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok110") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - - QTest::newRow("ok120") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok121") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok122") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok123") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok124") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok125") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok126") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok127") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok128") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok129") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok130") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - - QTest::newRow("ok140") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok141") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok142") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok143") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok144") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok145") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok146") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok147") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok148") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok149") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok150") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok160") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok161") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok162") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok163") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok164") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok165") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok166") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok167") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok168") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok169") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok170") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok180") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok181") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok182") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok183") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok184") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok185") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok186") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok187") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok188") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok189") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok190") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok200") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok201") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok202") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok203") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok204") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok205") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok206") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok207") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok208") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok209") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok210") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok220") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok221") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok222") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok223") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok224") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok225") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok226") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok227") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok228") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok229") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok230") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok240") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok241") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok242") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok243") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok244") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok245") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok246") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok247") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok248") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok249") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok250") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok260") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok261") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok262") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok263") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok264") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok265") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok266") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok267") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok268") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok269") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok270") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok280") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok281") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok282") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok283") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok284") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok285") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok286") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok287") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok288") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok289") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok290") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok300") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok301") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok302") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok303") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok304") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok305") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok306") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok307") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok308") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok309") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok310") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok320") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok321") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok322") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok323") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok324") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok325") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok326") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok327") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok328") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok329") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok330") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok340") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok341") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok342") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok343") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok344") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok345") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok346") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok347") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok348") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok349") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok350") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; -#endif -} - void tst_QSplitter::saveAndRestoreState_data() { saveState_data(); @@ -1340,14 +685,14 @@ void tst_QSplitter::task187373_addAbstractScrollAreas() QFETCH(QString, className); QFETCH(bool, addInConstructor); QFETCH(bool, addOutsideConstructor); - Q_ASSERT(addInConstructor || addOutsideConstructor); + QVERIFY(addInConstructor || addOutsideConstructor); QSplitter *splitter = new QSplitter; splitter->show(); - Q_ASSERT(splitter->isVisible()); + QVERIFY(splitter->isVisible()); QAbstractScrollArea *w = task187373_createScrollArea(splitter, className, addInConstructor); - Q_ASSERT(w); + QVERIFY(w); if (addOutsideConstructor) splitter->addWidget(w); diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/qsql/tst_qsql.cpp index c34f94cf43..7f3c63b510 100644 --- a/tests/auto/qsql/tst_qsql.cpp +++ b/tests/auto/qsql/tst_qsql.cpp @@ -45,9 +45,6 @@ #include #include #include -#ifdef QT3_SUPPORT -#include -#endif #include #include #include @@ -143,53 +140,12 @@ void tst_QSql::basicDriverTest() continue; } - qDebug( qPrintable( QLatin1String( "Testing: " ) + tst_Databases::dbToString( db ) ) ); + qDebug("Testing: %s", qPrintable(tst_Databases::dbToString( db ))); QSqlRecord rInf = db.record( tableName ); QCOMPARE( rInf.count(), 2 ); QCOMPARE( rInf.fieldName( 0 ).toLower(), QString( "id" ) ); QCOMPARE( rInf.fieldName( 1 ).toLower(), QString( "name" ) ); - -#ifdef QT3_SUPPORT - QSqlRecord* rec = 0; - Q3SqlCursor cur( tableName, true, db ); - QVERIFY_SQL( cur, select() ); - QCOMPARE( cur.count(), 2 ); - QCOMPARE( cur.fieldName( 0 ).lower(), QString( "id" ) ); - QCOMPARE( cur.fieldName( 1 ).lower(), QString( "name" ) ); - - rec = cur.primeDelete(); - rec->setGenerated( 0, false ); - rec->setGenerated( 1, false ); - QVERIFY_SQL( cur, del() ); - QVERIFY_SQL( cur, select() ); - QCOMPARE( cur.at(), int( QSql::BeforeFirst ) ); - QVERIFY( !cur.next() ); - rec = cur.primeInsert(); - rec->setValue( 0, 1 ); - rec->setValue( 1, QString( "Harry" ) ); - QVERIFY_SQL( cur, insert( false ) ); - rec = cur.primeInsert(); - rec->setValue( 0, 2 ); - rec->setValue( 1, QString( "Trond" ) ); - QVERIFY_SQL( cur, insert( true ) ); - QVERIFY_SQL( cur, select( cur.index( QString( "id" ) ) ) ); - QVERIFY_SQL( cur, next() ); - QCOMPARE( cur.value( 0 ).toInt(), 1 ); - QCOMPARE( cur.value( 1 ).toString().stripWhiteSpace(), QString( "Harry" ) ); - QVERIFY_SQL( cur, next() ); - QCOMPARE( cur.value( 0 ).toInt(), 2 ); - QCOMPARE( cur.value( 1 ).toString().stripWhiteSpace(), QString( "Trond" ) ); - QVERIFY( !cur.next() ); - QVERIFY_SQL( cur, first() ); - rec = cur.primeUpdate(); - rec->setValue( 1, QString( "Vohi" ) ); - QVERIFY_SQL( cur, update( true ) ); - QVERIFY_SQL( cur, select( "id = 1" ) ); - QVERIFY_SQL( cur, next() ); - QCOMPARE( cur.value( 0 ).toInt(), 1 ); - QCOMPARE( cur.value( 1 ).toString().stripWhiteSpace(), QString( "Vohi" ) ); -#endif } dbs.close(); @@ -274,8 +230,8 @@ void tst_QSql::openErrorRecovery() // force an open error if ( db.open( "dummy130977", "doesnt_exist" ) ) { - qDebug( qPrintable(QLatin1String("Promiscuous database server without access control - test skipped for ") + - tst_Databases::dbToString( db )) ); + qDebug("Promiscuous database server without access control - test skipped for %s", + qPrintable(tst_Databases::dbToString( db )) ); QVERIFY(1); continue; } diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp index 4462659502..96ea3d95d7 100644 --- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp @@ -44,11 +44,6 @@ #include #include #include -#ifdef QT3_SUPPORT -#include -#include -#include -#endif #include #include #include @@ -130,8 +125,6 @@ private slots: //problem specific tests void alterTable_data() { generic_data(); } void alterTable(); - void recordNonSelect_data() { generic_data(); } - void recordNonSelect(); void caseSensivity_data() { generic_data(); } void caseSensivity(); void noEscapedFieldNamesInRecord_data() { generic_data(); } @@ -211,20 +204,14 @@ private: void populateTestTables(QSqlDatabase db); void generic_data(const QString &engine=QString()); -#ifdef QT3_SUPPORT - void testRecordInfo(const FieldDef fieldDefs[], const Q3SqlRecordInfo& inf); -#endif void testRecord(const FieldDef fieldDefs[], const QSqlRecord& inf, QSqlDatabase db); void commonFieldTest(const FieldDef fieldDefs[], QSqlDatabase, const int); - void checkValues(const FieldDef fieldDefs[], QSqlDatabase db); - void checkNullValues(const FieldDef fieldDefs[], QSqlDatabase db); tst_Databases dbs; }; // number of records to be inserted per testfunction static const int ITERATION_COUNT = 2; -static int pkey = 1; //helper class for database specific tests struct FieldDef { @@ -238,11 +225,7 @@ struct FieldDef { { QString rt = typeName; rt.replace(QRegExp("\\s"), QString("_")); -#ifdef QT3_SUPPORT - int i = rt.find("("); -#else int i = rt.indexOf("("); -#endif if (i == -1) i = rt.length(); if (i > 20) @@ -482,31 +465,6 @@ void tst_QSqlDatabase::open() } } -void tst_QSqlDatabase::recordNonSelect() -{ -#ifdef QT3_SUPPORT - QFETCH(QString, dbName); - QSqlDatabase db = QSqlDatabase::database(dbName); - CHECK_DATABASE(db); - - QSqlQuery q(db); - - // nothing should happen on an empty query - QSqlRecord rec = db.record(q); - QVERIFY(rec.isEmpty()); - Q3SqlRecordInfo rInf = db.recordInfo(q); - QVERIFY(rInf.isEmpty()); - - QVERIFY_SQL(q, exec("create table " + qTableName("qtest_temp", __FILE__) + " (id int)")); - - // query without result set should return empty record - rec = db.record(q); - QVERIFY(rec.isEmpty()); - rInf = db.recordInfo(q); - QVERIFY(rInf.isEmpty()); -#endif -} - void tst_QSqlDatabase::tables() { QFETCH(QString, dbName); @@ -524,8 +482,9 @@ void tst_QSqlDatabase::tables() if (!q.exec("CREATE VIEW " + qtest_view + " as select * from " + qtest)) { - qDebug(QString("DBMS '%1' cannot handle VIEWs: %2").arg( - tst_Databases::dbToString(db)).arg(QString(tst_Databases::printError(q.lastError()))).toLatin1()); + qDebug("DBMS '%s' cannot handle VIEWs: %s", + qPrintable(tst_Databases::dbToString(db)), + qPrintable(tst_Databases::printError(q.lastError()))); views = false; } @@ -612,18 +571,10 @@ void tst_QSqlDatabase::alterTable() QVERIFY_SQL(q, exec("create table " + qtestalter + " (F1 char(20), F2 char(20), F3 char(20))")); QSqlRecord rec = db.record(qtestalter); QCOMPARE((int)rec.count(), 3); -#ifdef QT3_SUPPORT - Q3SqlRecordInfo rinf = db.recordInfo(qtestalter); - QCOMPARE((int)rinf.count(), 3); -#endif - int i; for (i = 0; i < 3; ++i) { QCOMPARE(rec.field(i).name().toUpper(), QString("F%1").arg(i + 1)); -#ifdef QT3_SUPPORT - QCOMPARE(rinf[ i ].name().upper(), QString("F%1").arg(i + 1)); -#endif } if (!q.exec("alter table " + qtestalter + " drop column F2")) { @@ -631,36 +582,13 @@ void tst_QSqlDatabase::alterTable() } rec = db.record(qtestalter); -#ifdef QT3_SUPPORT - rinf = db.recordInfo(qtestalter); -#endif QCOMPARE((int)rec.count(), 2); -#ifdef QT3_SUPPORT - QCOMPARE((int)rinf.count(), 2); -#endif QCOMPARE(rec.field(0).name().toUpper(), QString("F1")); QCOMPARE(rec.field(1).name().toUpper(), QString("F3")); -#ifdef QT3_SUPPORT - QCOMPARE(rinf[ 0 ].name().upper(), QString("F1")); - QCOMPARE(rinf[ 1 ].name().upper(), QString("F3")); -#endif q.exec("select * from " + qtestalter); - -#ifdef QT3_SUPPORT - rec = db.record(q); - rinf = db.recordInfo(q); - - QCOMPARE((int)rec.count(), 2); - QCOMPARE((int)rinf.count(), 2); - - QCOMPARE(rec.field(0).name().upper(), QString("F1")); - QCOMPARE(rec.field(1).name().upper(), QString("F3")); - QCOMPARE(rinf[ 0 ].name().upper(), QString("F1")); - QCOMPARE(rinf[ 1 ].name().upper(), QString("F3")); -#endif } #if 0 @@ -684,27 +612,7 @@ void tst_QSqlDatabase::record() const int fieldCount = createFieldTable(fieldDefs, db); QVERIFY(fieldCount > 0); -// doesn't work with oracle: checkNullValues(fieldDefs, db); commonFieldTest(fieldDefs, db, fieldCount); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } -} -#endif - -#ifdef QT3_SUPPORT -void tst_QSqlDatabase::testRecordInfo(const FieldDef fieldDefs[], const Q3SqlRecordInfo& inf) -{ - int i = 0; - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - QCOMPARE(inf[i+1].name().upper(), fieldDefs[ i ].fieldName().upper()); - if (inf[i+1].type() != fieldDefs[ i ].type) { - QFAIL(QString(" Expected: '%1' Received: '%2' for field %3 in testRecordInfo").arg( - QVariant::typeToName(fieldDefs[ i ].type)).arg( - QVariant::typeToName(inf[i+1].type())).arg( - fieldDefs[ i ].fieldName())); - } - } } #endif @@ -732,126 +640,12 @@ void tst_QSqlDatabase::commonFieldTest(const FieldDef fieldDefs[], QSqlDatabase { CHECK_DATABASE(db); - // check whether recordInfo returns the right types -#ifdef QT3_SUPPORT - Q3SqlRecordInfo inf = db.recordInfo(qTableName("qtestfields", __FILE__)); - QCOMPARE((int)inf.count(), fieldCount+1); - testRecordInfo(fieldDefs, inf); -#endif - QSqlRecord rec = db.record(qTableName("qtestfields", __FILE__)); QCOMPARE((int)rec.count(), fieldCount+1); testRecord(fieldDefs, rec, db); QSqlQuery q(db); QVERIFY_SQL(q, exec("select * from " + qTableName("qtestfields", __FILE__))); - -#ifdef QT3_SUPPORT - inf = db.recordInfo(q); - QCOMPARE((int)inf.count(), fieldCount+1); - testRecordInfo(fieldDefs, inf); - - rec = db.record(q); - QCOMPARE((int)rec.count(), fieldCount+1); - testRecord(fieldDefs, rec, db); -#endif -} - -// inserts testdata into the testtable, fetches and compares them -void tst_QSqlDatabase::checkValues(const FieldDef fieldDefs[], QSqlDatabase db) -{ - Q_UNUSED(fieldDefs); -#ifdef QT3_SUPPORT - CHECK_DATABASE(db); - - Q3SqlCursor cur(qTableName("qtestfields", __FILE__), true, db); - QVERIFY_SQL(cur, select()); - QSqlRecord* rec = cur.primeInsert(); - Q_ASSERT(rec); - rec->setValue("id", pkey++); - int i = 0; - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - rec->setValue(fieldDefs[ i ].fieldName(), fieldDefs[ i ].val); -// qDebug(QString("inserting %1 into %2").arg(fieldDefs[ i ].val.toString()).arg(fieldDefs[ i ].fieldName())); - } - QVERIFY_SQL(cur, insert()); - cur.setForwardOnly(true); - QVERIFY_SQL(cur, select("id = " + QString::number(pkey - 1))); - QVERIFY_SQL(cur, next()); - - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - bool ok = false; - QVariant val1 = cur.value(fieldDefs[ i ].fieldName()); - QVariant val2 = fieldDefs[ i ].val; - if (val1.type() == QVariant::String) - //TDS Workaround - val1 = val1.toString().stripWhiteSpace(); - if (fieldDefs[ i ].fieldName() == "t_real") { - // strip precision - val1 = (float)val1.toDouble(); - val2 = (float)val2.toDouble(); - } - if (val1.canCast(QVariant::Double) && val2.type() == QVariant::Double) { - // we don't care about precision here, we just want to know whether - // we can insert/fetch the right values - ok = (val1.toDouble() - val2.toDouble() < 0.00001); - } else if (val1.type() == val2.type()) { - ok = (val1 == val2); - } else { - ok = (val1.toString() == val2.toString()); - } - if (!ok) { - if (val2.type() == QVariant::DateTime || val2.type() == QVariant::Time) - qDebug("Expected Time: " + val2.toTime().toString("hh:mm:ss.zzz")); - if (val1.type() == QVariant::DateTime || val1.type() == QVariant::Time) - qDebug("Received Time: " + val1.toTime().toString("hh:mm:ss.zzz")); - QFAIL(QString(" Expected: '%1' Received: '%2' for field %3 (etype %4 rtype %5) in checkValues").arg( - val2.type() == QVariant::ByteArray ? val2.toByteArray().toHex() : val2.toString()).arg( - val1.type() == QVariant::ByteArray ? val1.toByteArray().toHex() : val1.toString()).arg( - fieldDefs[ i ].fieldName()).arg( - val2.typeName()).arg( - val1.typeName()) - ); - } - } -#endif -} - -// inserts a NULL value for each nullable field in testdata, fetches and checks whether -// we get back NULL -void tst_QSqlDatabase::checkNullValues(const FieldDef fieldDefs[], QSqlDatabase db) -{ - Q_UNUSED(fieldDefs); -#ifdef QT3_SUPPORT - CHECK_DATABASE(db); - - Q3SqlCursor cur(qTableName("qtestfields", __FILE__), true, db); - QVERIFY_SQL(cur, select()); - QSqlRecord* rec = cur.primeInsert(); - Q_ASSERT(rec); - rec->setValue("id", pkey++); - int i = 0; - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - if (fieldDefs[ i ].fieldName(), fieldDefs[ i ].nullable) - rec->setNull(fieldDefs[ i ].fieldName()); - else - rec->setValue(fieldDefs[ i ].fieldName(), fieldDefs[ i ].val); - } - QVERIFY_SQL(cur, insert()); - cur.setForwardOnly(true); - QVERIFY_SQL(cur, select("id = " + QString::number(pkey - 1))); - QVERIFY_SQL(cur, next()); - - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - if (fieldDefs[ i ].nullable == false) - continue; - // multiple inheritance sucks so much - QVERIFY2(((QSqlQuery)cur).isNull(i + 1), "Check whether '" + fieldDefs[ i ].fieldName() + "' is null in QSqlQuery"); - QVERIFY2(((QSqlRecord)cur).isNull(fieldDefs[ i ].fieldName()), "Check whether '" + fieldDefs[ i ].fieldName() + "' is null in QSqlRecord"); - if (!cur.value(fieldDefs[ i ].fieldName()).isNull()) - qDebug(QString("QVariant is not null for NULL-Value in Field '%1'").arg(fieldDefs[ i ].fieldName())); - } -#endif } void tst_QSqlDatabase::recordTDS() @@ -880,11 +674,6 @@ void tst_QSqlDatabase::recordTDS() FieldDef("nchar(20)", QVariant::String, "blah3"), FieldDef("nvarchar(20)", QVariant::String, "blah4"), FieldDef("text", QVariant::String, "blah5"), -#ifdef QT3_SUPPORT - FieldDef("binary(20)", QVariant::ByteArray, Q3CString("blah6")), - FieldDef("varbinary(20)", QVariant::ByteArray, Q3CString("blah7")), - FieldDef("image", QVariant::ByteArray, Q3CString("blah8")), -#endif FieldDef("bit", QVariant::Int, 1, false), FieldDef() @@ -894,10 +683,6 @@ void tst_QSqlDatabase::recordTDS() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordOCI() @@ -954,9 +739,6 @@ void tst_QSqlDatabase::recordOCI() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) - checkValues(fieldDefs, db); // some additional tests QSqlRecord rec = db.record(qTableName("qtestfields", __FILE__)); @@ -978,18 +760,11 @@ void tst_QSqlDatabase::recordPSQL() FieldDef byteadef; if (db.driver()->hasFeature(QSqlDriver::BLOB)) -#ifdef QT3_SUPPORT - byteadef = FieldDef("bytea", QVariant::ByteArray, QByteArray(Q3CString("bl\\ah"))); -#else byteadef = FieldDef("bytea", QVariant::ByteArray, QByteArray("bl\\ah")); -#endif static FieldDef fieldDefs[] = { FieldDef("bigint", QVariant::LongLong, Q_INT64_C(9223372036854775807)), FieldDef("bigserial", QVariant::LongLong, 100, false), FieldDef("bit", QVariant::String, "1"), // a bit in postgres is a bit-string -#ifdef QT3_SUPPORT - FieldDef("boolean", QVariant::Bool, QVariant(bool(true), 0)), -#endif FieldDef("box", QVariant::String, "(5,6),(1,2)"), FieldDef("char(20)", QVariant::String, "blah5678901234567890"), FieldDef("varchar(20)", QVariant::String, "blah5678901234567890"), @@ -1038,7 +813,6 @@ void tst_QSqlDatabase::recordPSQL() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); for (int i = 0; i < ITERATION_COUNT; ++i) { // increase serial values for (int i2 = 0; !fieldDefs[ i2 ].typeName.isNull(); ++i2) { @@ -1046,15 +820,10 @@ void tst_QSqlDatabase::recordPSQL() fieldDefs[ i2 ].typeName == "bigserial") { FieldDef def = fieldDefs[ i2 ]; -#ifdef QT3_SUPPORT - def.val = def.val.asInt() + 1; -#else def.val = def.val.toInt() + 1; -#endif fieldDefs[ i2 ] = def; } } - checkValues(fieldDefs, db); } } @@ -1076,13 +845,8 @@ void tst_QSqlDatabase::recordMySQL() with space on insert, and trailing spaces are removed on select. */ if( vernum >= ((5 << 16) + 15) ) { -#ifdef QT3_SUPPORT - bin10 = FieldDef("binary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abc "))); - varbin10 = FieldDef("varbinary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abcv "))); -#else bin10 = FieldDef("binary(10)", QVariant::ByteArray, QString("123abc ")); varbin10 = FieldDef("varbinary(10)", QVariant::ByteArray, QString("123abcv ")); -#endif } static QDateTime dt(QDate::currentDate(), QTime(1, 2, 3, 0)); @@ -1108,20 +872,10 @@ void tst_QSqlDatabase::recordMySQL() FieldDef("year", QVariant::Int, 2003), FieldDef("char(20)", QVariant::String, "Blah"), FieldDef("varchar(20)", QVariant::String, "BlahBlah"), -#ifdef QT3_SUPPORT - FieldDef("tinyblob", QVariant::ByteArray, QByteArray(Q3CString("blah1"))), - FieldDef("blob", QVariant::ByteArray, QByteArray(Q3CString("blah2"))), - FieldDef("mediumblob", QVariant::ByteArray,QByteArray(Q3CString("blah3"))), - FieldDef("longblob", QVariant::ByteArray, QByteArray(Q3CString("blah4"))), -#endif FieldDef("tinytext", QVariant::String, QString("blah5")), FieldDef("text", QVariant::String, QString("blah6")), FieldDef("mediumtext", QVariant::String, QString("blah7")), FieldDef("longtext", QVariant::String, QString("blah8")), -#ifdef QT3_SUPPORT - bin10, - varbin10, -#endif // SET OF? FieldDef() @@ -1131,10 +885,6 @@ void tst_QSqlDatabase::recordMySQL() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } QSqlQuery q(db); QVERIFY_SQL(q, exec("SELECT DATE_SUB(CURDATE(), INTERVAL 2 DAY)")); @@ -1168,11 +918,6 @@ void tst_QSqlDatabase::recordDB2() // FieldDef("graphic(20)", QVariant::String, QString("Blah4")), // FieldDef("vargraphic(20)", QVariant::String, QString("Blah5")), // FieldDef("long vargraphic", QVariant::String, QString("Blah6")), -#ifdef QT3_SUPPORT -// FieldDef("clob(20)", QVariant::CString, QString("Blah7")), -// FieldDef("dbclob(20)", QVariant::CString, QString("Blah8")), -// FieldDef("blob(20)", QVariant::ByteArray, QByteArray(Q3CString("Blah9"))), -#endif //X FieldDef("datalink", QVariant::String, QString("DLVALUE('Blah10')")), FieldDef() }; @@ -1181,10 +926,6 @@ void tst_QSqlDatabase::recordDB2() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordIBase() @@ -1211,10 +952,6 @@ void tst_QSqlDatabase::recordIBase() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordSQLite() @@ -1241,10 +978,6 @@ void tst_QSqlDatabase::recordSQLite() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordSQLServer() @@ -1264,9 +997,6 @@ void tst_QSqlDatabase::recordSQLServer() FieldDef("bigint", QVariant::LongLong, 12345), FieldDef("int", QVariant::Int, 123456), FieldDef("tinyint", QVariant::UInt, 255), -#ifdef QT3_SUPPORT - FieldDef("image", QVariant::ByteArray, Q3CString("Blah1")), -#endif FieldDef("float", QVariant::Double, 1.12345), FieldDef("numeric(5,2)", QVariant::Double, 123.45), FieldDef("uniqueidentifier", QVariant::String, @@ -1279,10 +1009,6 @@ void tst_QSqlDatabase::recordSQLServer() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordAccess() @@ -1306,9 +1032,6 @@ void tst_QSqlDatabase::recordAccess() FieldDef("single", QVariant::Double, 1.12345), FieldDef("double", QVariant::Double, 1.123456), FieldDef("byte", QVariant::UInt, 255), -#ifdef QT3_SUPPORT - FieldDef("binary(5)", QVariant::ByteArray, Q3CString("Blah2")), -#endif FieldDef("long", QVariant::Int, 2147483647), FieldDef("memo", QVariant::String, memo), FieldDef() @@ -1318,10 +1041,6 @@ void tst_QSqlDatabase::recordAccess() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::transaction() @@ -1361,7 +1080,7 @@ void tst_QSqlDatabase::transaction() q.clear(); // for SQLite which does not allow any references on rows that shall be rolled back if (!db.rollback()) { if (db.driverName().startsWith("QMYSQL")) { - qDebug("MySQL: " + tst_Databases::printError(db.lastError())); + qDebug("MySQL: %s", qPrintable(tst_Databases::printError(db.lastError()))); QSKIP("MySQL transaction failed ", SkipSingle); //non-fatal } else { QFAIL("Could not rollback transaction: " + tst_Databases::printError(db.lastError())); @@ -1462,17 +1181,6 @@ void tst_QSqlDatabase::caseSensivity() QVERIFY((int)rec.count() > 0); } -#ifdef QT3_SUPPORT - Q3SqlRecordInfo rInf = db.recordInfo(qTableName("qtest", __FILE__)); - QVERIFY((int)rInf.count() > 0); - if (!cs) { - rInf = db.recordInfo(qTableName("QTEST", __FILE__).upper()); - QVERIFY((int)rInf.count() > 0); - rInf = db.recordInfo(qTableName("qTesT", __FILE__)); - QVERIFY((int)rInf.count() > 0); - } -#endif - rec = db.primaryIndex(qTableName("qtest", __FILE__)); QVERIFY((int)rec.count() > 0); if (!cs) { @@ -1526,12 +1234,6 @@ void tst_QSqlDatabase::psql_schemas() QCOMPARE(rec.fieldName(0), QString("id")); QCOMPARE(rec.fieldName(1), QString("name")); -#ifdef QT3_SUPPORT - rec = db.record(QSqlQuery("select * from " + table, db)); - QCOMPARE(rec.count(), 2); - QCOMPARE(rec.fieldName(0), QString("id")); - QCOMPARE(rec.fieldName(1), QString("name")); -#endif QSqlIndex idx = db.primaryIndex(table); QCOMPARE(idx.count(), 1); QCOMPARE(idx.fieldName(0), QString("id")); @@ -2159,7 +1861,7 @@ void tst_QSqlDatabase::oci_serverDetach() } } if(!db.open()) - qFatal(tst_Databases::printError(db.lastError(), db)); + qFatal("%s", qPrintable(tst_Databases::printError(db.lastError(), db))); } void tst_QSqlDatabase::oci_xmltypeSupport() diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index be2087dfc8..eb7ae9184e 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -1558,7 +1558,7 @@ void tst_QSqlQuery::transaction() if ( !q.exec( "rollback" ) ) { if ( db.driverName().startsWith( "QMYSQL" ) ) { - qDebug( "MySQL: " + tst_Databases::printError( q.lastError() ) ); + qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) )); QSKIP( "MySQL transaction failed ", SkipSingle ); //non-fatal } else QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) ); @@ -1578,8 +1578,8 @@ void tst_QSqlQuery::transaction() QVERIFY_SQL( q2, exec( "select * from" + qtest + " where id = 42" ) ); if ( q2.next() ) - qDebug( QString( "DBMS '%1' doesn't support query based transactions with concurrent access" ).arg( - tst_Databases::dbToString( db ) ).toLatin1() ); + qDebug("DBMS '%s' doesn't support query based transactions with concurrent access", + qPrintable(tst_Databases::dbToString( db ))); QVERIFY_SQL( q, exec( "commit" ) ); diff --git a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp index 431dfbf3fe..41c4e3b1cf 100644 --- a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp +++ b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp @@ -70,12 +70,6 @@ public slots: void cleanup(); private slots: void value(); -#ifdef QT3_SUPPORT - void toStringList_data(); - void toStringList(); - void toString_data(); - void toString(); -#endif // QT3_SUPPORT void setValue_data(); void setValue(); void setNull(); @@ -166,12 +160,6 @@ void tst_QSqlRecord::append() QCOMPARE( rec->indexOf( "int" ), 1 ); QCOMPARE( rec->indexOf( "double" ), 2 ); QCOMPARE( rec->indexOf( "bool" ), 3 ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( "string" ), 0 ); - QCOMPARE( rec->position( "int" ), 1 ); - QCOMPARE( rec->position( "double" ), 2 ); - QCOMPARE( rec->position( "bool" ), 3 ); -#endif } void tst_QSqlRecord::clear() @@ -181,10 +169,6 @@ void tst_QSqlRecord::clear() rec->clear(); QCOMPARE( (int)rec->count(), 0 ); QVERIFY( rec->isEmpty() ); -#ifdef QT3_SUPPORT - QVERIFY( rec->fieldPtr( 0 ) == 0 ); - QVERIFY( rec->fieldPtr( "_This should give a warning!_" ) == 0 ); -#endif QVERIFY( !rec->contains( fields[0]->name() ) ); } @@ -236,12 +220,6 @@ void tst_QSqlRecord::clearValues() QCOMPARE( rec->indexOf( "int" ), 1 ); QCOMPARE( rec->indexOf( "double" ), 2 ); QCOMPARE( rec->indexOf( "bool" ), 3 ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( "string" ), 0 ); - QCOMPARE( rec->position( "int" ), 1 ); - QCOMPARE( rec->position( "double" ), 2 ); - QCOMPARE( rec->position( "bool" ), 3 ); -#endif for ( i = 0; i < 4; ++i ) rec->setNull( i ); @@ -287,9 +265,6 @@ void tst_QSqlRecord::field() int i; for ( i = 0; i < NUM_FIELDS; ++i ) QVERIFY( rec->field( i ) == *fields[ i ] ); -#ifdef QT3_SUPPORT - QVERIFY( rec->fieldPtr( NUM_FIELDS ) == 0 ); -#endif for ( i = 0; i < NUM_FIELDS; ++i ) QVERIFY( rec->field( (fields[ i ] )->name() ) == *( fields[ i ] ) ); @@ -438,9 +413,6 @@ void tst_QSqlRecord::position() int i; for ( i = 0; i < NUM_FIELDS; ++i ) { QCOMPARE( rec->indexOf( fields[ i ]->name() ), i ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( fields[ i ]->name() ), i ); -#endif } } @@ -499,12 +471,6 @@ void tst_QSqlRecord::setValue() QCOMPARE( rec->indexOf( "int" ), 1 ); QCOMPARE( rec->indexOf( "double" ), 2 ); QCOMPARE( rec->indexOf( "bool" ), 3 ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( "string" ), 0 ); - QCOMPARE( rec->position( "int" ), 1 ); - QCOMPARE( rec->position( "double" ), 2 ); - QCOMPARE( rec->position( "bool" ), 3 ); -#endif QFETCH( int, ival ); QFETCH( QString, sval ); @@ -543,58 +509,6 @@ void tst_QSqlRecord::setValue() QCOMPARE( rec->value( 3 ), QVariant(bval) ); } -#ifdef QT3_SUPPORT -void tst_QSqlRecord::toString_data() -{ - clearValues_data( t ); -} - -void tst_QSqlRecord::toString() -{ - createTestRecord(); - QString result; - QFETCH( QString, prefix ); - QFETCH( QString, sep ); - rec->setGenerated( 1, false ); - for (int i = 0; i < NUM_FIELDS; ++i ) { - if ( i == 1 ) - continue; - if ( prefix.isEmpty() ) { - result += fields[ i ]->name(); - } else { - result += prefix + '.' + fields[ i ]->name(); - } - if ( i != NUM_FIELDS - 1 ) - result += sep + ' '; - } - QCOMPARE( rec->toString( prefix, sep ), result ); -} - -void tst_QSqlRecord::toStringList_data() -{ - clearValues_data( t ); -} - -void tst_QSqlRecord::toStringList() -{ - createTestRecord(); - QStringList result; - QFETCH( QString, prefix ); - rec->setGenerated( 1, false ); - for (int i = 0; i < NUM_FIELDS; ++i ) { - if ( i == 1 ) - continue; - if ( prefix.isEmpty() ) { - result << fields[ i ]->name(); - } else { - result << ( prefix + '.' + fields[ i ]->name() ); - } - } - QCOMPARE(rec->toStringList( prefix ), result); -} - -#endif // QT3_SUPPORT - void tst_QSqlRecord::value() { // this test is already covered in setValue() diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro index 77517e05bc..76d73b7cb3 100644 --- a/tests/auto/qsslsocket/qsslsocket.pro +++ b/tests/auto/qsslsocket/qsslsocket.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsslsocket.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += core-private network-private QT -= gui TARGET = tst_qsslsocket diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index b508d4795b..576f2f6f0d 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1561,12 +1561,13 @@ protected: #else bool ret = server.waitForNewConnection(20000); #endif + Q_UNUSED(ret); // delayed start of encryption QTest::qSleep(100); QSslSocket *socket = server.socket; - QVERIFY(socket); - QVERIFY(socket->isValid()); + if (!socket || !socket->isValid()) + return; // error socket->ignoreSslErrors(); socket->startServerEncryption(); if (!socket->waitForEncrypted(2000)) @@ -1955,7 +1956,7 @@ void tst_QSslSocket::writeBigChunk() QByteArray data; data.resize(1024*1024*10); // 10 MB // init with garbage. needed so ssl cannot compress it in an efficient way. - for (int i = 0; i < data.size() / sizeof(int); i++) { + for (size_t i = 0; i < data.size() / sizeof(int); i++) { int r = qrand(); data.data()[i*sizeof(int)] = r; } diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index 53020eb892..42373b0324 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += core-private network-private QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_member diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index 3452a92fe2..3a06ec190c 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += core-private network-private QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_static diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index 231cab03b2..56b0c9bf8a 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -4374,7 +4374,9 @@ void tst_QStateMachine::eventClassesExported() { // make sure this links QStateMachine::WrappedEvent *wrappedEvent = new QStateMachine::WrappedEvent(0, 0); + Q_UNUSED(wrappedEvent); QStateMachine::SignalEvent *signalEvent = new QStateMachine::SignalEvent(0, 0, QList()); + Q_UNUSED(signalEvent); } void tst_QStateMachine::stopInTransitionToFinalState() diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index 3d80e80dd2..641888613d 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -151,7 +151,6 @@ private slots: void indexOf3_data(); // void indexOf3(); void sprintf(); - void copy(); void fill(); void truncate(); void constructor(); @@ -904,19 +903,6 @@ void tst_QString::fill() QCOMPARE(f,(QString)"FFF"); } -void tst_QString::copy() -{ -#ifdef QT3_SUPPORT - QString e; - e = "String E"; - QString ce = e.copy(); - QCOMPARE(ce,(QString)"String E"); - e = "XXX"; - QCOMPARE(ce,(QString)"String E"); - QCOMPARE(e,(QString)"XXX"); -#endif -} - void tst_QString::sprintf() { QString a; @@ -3364,7 +3350,7 @@ void tst_QString::local8Bit_data() /* QString::local8Bit() called on a null QString returns an _empty_ - QByteArray. This is the correct behavior since Qt 3.1. + QByteArray. */ QTest::newRow("nullString") << QString() << QByteArray(""); QTest::newRow("emptyString") << QString("") << QByteArray(""); @@ -3429,9 +3415,9 @@ void tst_QString::fromLatin1Roundtrip() QFETCH(QString, unicode); // QtTest safety check: - Q_ASSERT(latin1.isNull() == unicode.isNull()); - Q_ASSERT(latin1.isEmpty() == unicode.isEmpty()); - Q_ASSERT(latin1.length() == unicode.length()); + QCOMPARE(latin1.isNull(), unicode.isNull()); + QCOMPARE(latin1.isEmpty(), unicode.isEmpty()); + QCOMPARE(latin1.length(), unicode.length()); if (!latin1.isEmpty()) while (latin1.length() < 128) { @@ -3484,12 +3470,12 @@ void tst_QString::toLatin1Roundtrip() QFETCH(QString, unicodedst); // QtTest safety check: - Q_ASSERT(latin1.isNull() == unicodesrc.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodesrc.isEmpty()); - Q_ASSERT(latin1.length() == unicodesrc.length()); - Q_ASSERT(latin1.isNull() == unicodedst.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodedst.isEmpty()); - Q_ASSERT(latin1.length() == unicodedst.length()); + QCOMPARE(latin1.isNull(), unicodesrc.isNull()); + QCOMPARE(latin1.isEmpty(), unicodesrc.isEmpty()); + QCOMPARE(latin1.length(), unicodesrc.length()); + QCOMPARE(latin1.isNull(), unicodedst.isNull()); + QCOMPARE(latin1.isEmpty(), unicodedst.isEmpty()); + QCOMPARE(latin1.length(), unicodedst.length()); if (!latin1.isEmpty()) while (latin1.length() < 128) { @@ -3519,12 +3505,12 @@ void tst_QString::stringRef_toLatin1Roundtrip() QFETCH(QString, unicodedst); // QtTest safety check: - Q_ASSERT(latin1.isNull() == unicodesrc.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodesrc.isEmpty()); - Q_ASSERT(latin1.length() == unicodesrc.length()); - Q_ASSERT(latin1.isNull() == unicodedst.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodedst.isEmpty()); - Q_ASSERT(latin1.length() == unicodedst.length()); + QCOMPARE(latin1.isNull(), unicodesrc.isNull()); + QCOMPARE(latin1.isEmpty(), unicodesrc.isEmpty()); + QCOMPARE(latin1.length(), unicodesrc.length()); + QCOMPARE(latin1.isNull(), unicodedst.isNull()); + QCOMPARE(latin1.isEmpty(), unicodedst.isEmpty()); + QCOMPARE(latin1.length(), unicodedst.length()); if (!latin1.isEmpty()) while (latin1.length() < 128) { diff --git a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp index 36b6b80e51..463f200043 100644 --- a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp +++ b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp @@ -44,8 +44,7 @@ // this is the "no harm done" version. Only operator% is active, // with NO_CAST * defined #define P % -#undef QT_USE_FAST_OPERATOR_PLUS -#undef QT_USE_FAST_CONCATENATION +#undef QT_USE_QSTRINGBUILDER #define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp index 88b1f737e4..bcf88cbd69 100644 --- a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp +++ b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp @@ -45,8 +45,7 @@ // based version // with NO_CAST * defined #define P + -#define QT_USE_FAST_OPERATOR_PLUS -#define QT_USE_FAST_CONCATENATION +#define QT_USE_QSTRINGBUILDER #define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp index afc33339f2..338fbf400f 100644 --- a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp +++ b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp @@ -44,8 +44,7 @@ // this is the "no harm done" version. Only operator% is active, // with NO_CAST * _not_ defined #define P % -#undef QT_USE_FAST_OPERATOR_PLUS -#undef QT_USE_FAST_CONCATENATION +#undef QT_USE_QSTRINGBUILDER #undef QT_NO_CAST_FROM_ASCII #undef QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp index ae4100a078..d046e59484 100644 --- a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp +++ b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp @@ -45,8 +45,7 @@ // based version // with NO_CAST * _not_ defined #define P + -#define QT_USE_FAST_OPERATOR_PLUS -#define QT_USE_FAST_CONCATENATION +#define QT_USE_QSTRINGBUILDER #undef QT_NO_CAST_FROM_ASCII #undef QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index 5c319f0a9e..b844beb5a7 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -337,9 +337,6 @@ void tst_QStyle::testAllFunctions(QStyle *style) copt6.init(testWidget); QStyleOptionToolButton copt7; copt7.init(testWidget); - QStyleOptionQ3ListView copt8; - copt8.init(testWidget); - copt8.items << QStyleOptionQ3ListViewItem(); QStyleOptionComplex copt9; copt9.initFrom(testWidget); @@ -351,10 +348,6 @@ void tst_QStyle::testAllFunctions(QStyle *style) style->drawComplexControl(QStyle::CC_TitleBar, &copt6, &painter, 0); style->drawComplexControl(QStyle::CC_GroupBox, &copt2, &painter, 0); style->drawComplexControl(QStyle::CC_Dial, &copt4, &painter, 0); -#ifdef QT3_SUPPORT - style->drawComplexControl(QStyle::CC_Q3ListView, &copt8, &painter, 0); - style->drawComplexControl(QStyle::CC_MdiControls, &copt9, &painter, 0); -#endif } //Check standard pixmaps/icons @@ -380,6 +373,8 @@ void tst_QStyle::testScrollBarSubControls(QStyle* style) #ifdef Q_OS_WINCE_WM if (qobject_cast(style) && qt_wince_is_smartphone()) QSKIP("SmartPhone doesn't have scrollbar subcontrols.", SkipAll); +#else + Q_UNUSED(style); #endif QScrollBar scrollBar; diff --git a/tests/auto/qstyleoption/tst_qstyleoption.cpp b/tests/auto/qstyleoption/tst_qstyleoption.cpp index 52297248a1..70402fec5d 100644 --- a/tests/auto/qstyleoption/tst_qstyleoption.cpp +++ b/tests/auto/qstyleoption/tst_qstyleoption.cpp @@ -92,9 +92,6 @@ void tst_QStyleOption::qstyleoptioncast_data() QTest::newRow("optionHeader") << stylePtr(new QStyleOptionHeader) << false << int(QStyleOption::SO_Header); QTest::newRow("optionMenuItem") << stylePtr(new QStyleOptionMenuItem) << false << int(QStyleOption::SO_MenuItem); QTest::newRow("optionProgressBar") << stylePtr(new QStyleOptionProgressBar) << false << int(QStyleOption::SO_ProgressBar); - QTest::newRow("optionQ3DockWindow") << stylePtr(new QStyleOptionQ3DockWindow) << false << int(QStyleOption::SO_Q3DockWindow); - QTest::newRow("optionQ3ListView") << stylePtr(new QStyleOptionQ3ListView) << true << int(QStyleOption::SO_Q3ListView); - QTest::newRow("optionQ3ListViewItem") << stylePtr(new QStyleOptionQ3ListViewItem) << false << int(QStyleOption::SO_Q3ListViewItem); QTest::newRow("optionSlider") << stylePtr(new QStyleOptionSlider) << true << int(QStyleOption::SO_Slider); QTest::newRow("optionSpinBox") << stylePtr(new QStyleOptionSpinBox) << true << int(QStyleOption::SO_SpinBox); QTest::newRow("optionTab") << stylePtr(new QStyleOptionTab) << false << int(QStyleOption::SO_Tab); diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro index eada969d96..1575616b19 100644 --- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro @@ -1,5 +1,5 @@ load(qttest_p4) - +QT += gui-private # Input SOURCES += tst_qstylesheetstyle.cpp RESOURCES += resources.qrc diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp index 83adf49fa4..cb51c3dfdd 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -43,9 +43,6 @@ #include #include #include -#ifdef QT3_SUPPORT -#include -#endif #include #include "../platformquirks.h" @@ -1291,9 +1288,6 @@ void tst_QStyleSheetStyle::emptyStyleSheet() QWidget w; QHBoxLayout layout(&w); w.setLayout(&layout); -#ifdef QT3_SUPPORT - layout.addWidget(new Q3ProgressBar(&w)); //task 231137 -#endif layout.addWidget(new QPushButton("push", &w)); layout.addWidget(new QToolButton(&w)); QLabel label("toto", &w); diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index 380116d736..d715914796 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -3028,7 +3028,7 @@ void tst_QTableView::spans_data() << 1 << 2; - QTest::newRow("QTBUG-6004: No failing Q_ASSERT, then it passes.") + QTest::newRow("QTBUG-6004: No failing assertion, then it passes.") << 5 << 5 << (SpanList() << QRect(0, 0, 2, 2) << QRect(0, 0, 1, 1)) << false @@ -3036,7 +3036,7 @@ void tst_QTableView::spans_data() << 1 << 1; - QTest::newRow("QTBUG-6004 (follow-up): No failing Q_ASSERT, then it passes.") + QTest::newRow("QTBUG-6004 (follow-up): No failing assertion, then it passes.") << 10 << 10 << (SpanList() << QRect(2, 2, 1, 3) << QRect(2, 2, 1, 1)) << false diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp index 252450cc71..c305150af4 100644 --- a/tests/auto/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp @@ -381,9 +381,6 @@ void tst_QTabWidget::currentIndex() { // Test bad arguments QSignalSpy spy(tw, SIGNAL(currentChanged(int))); -#ifdef QT3_SUPPORT - QSignalSpy spySupport(tw, SIGNAL(currentChanged(QWidget *))); -#endif QCOMPARE(tw->currentIndex(), -1); tw->setCurrentIndex(-1); QCOMPARE(tw->currentIndex(), -1); @@ -395,10 +392,7 @@ void tst_QTabWidget::currentIndex() QCOMPARE(spy.count(), 1); QList arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == firstIndex); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 1); -#endif - + int index = addPage(); QCOMPARE(tw->currentIndex(), firstIndex); tw->setCurrentIndex(index); @@ -406,28 +400,18 @@ void tst_QTabWidget::currentIndex() QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == index); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 2); -#endif - + removePage(index); QCOMPARE(tw->currentIndex(), firstIndex); QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == firstIndex); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 3); -#endif removePage(firstIndex); QCOMPARE(tw->currentIndex(), -1); QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == -1); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 4); -#endif - } void tst_QTabWidget::cornerWidget() diff --git a/tests/auto/qtcpsocket/stressTest/Test.cpp b/tests/auto/qtcpsocket/stressTest/Test.cpp index 80b4c398f7..4304131352 100644 --- a/tests/auto/qtcpsocket/stressTest/Test.cpp +++ b/tests/auto/qtcpsocket/stressTest/Test.cpp @@ -47,87 +47,6 @@ // Test #include "Test.h" -#ifdef QT3_SUPPORT -//------------------------------------------------------------------------------ -My3Socket::My3Socket(QObject *parent) - : Q3Socket(parent), safeShutDown(false) -{ - connect(this, SIGNAL(readyRead()), this, SLOT(read())); - connect(this, SIGNAL(delayedCloseFinished()), this, SLOT(closed())); - connect(this, SIGNAL(connectionClosed()), this, SLOT(closed())); -} - -//------------------------------------------------------------------------------ -void My3Socket::read() -{ - QDataStream in(this); - - quint32 num, reply; - - while (bytesAvailable()) { - in >> num; - if (num == 42) { - qDebug("SUCCESS"); - safeShutDown = true; - QCoreApplication::instance()->quit(); - return; - } - reply = num + 1; - if (reply == 42) - ++reply; - } - - // Reply with a bigger number - sendTest(reply); -} - -//------------------------------------------------------------------------------ -void My3Socket::closed() -{ - if (!safeShutDown) - qDebug("FAILED"); - QCoreApplication::instance()->quit(); -} - -//------------------------------------------------------------------------------ -void My3Socket::sendTest(quint32 num) -{ - QByteArray block; - QDataStream out(&block, QIODevice::WriteOnly); - out << num; - writeBlock(block, block.size()); -} - -//------------------------------------------------------------------------------ -My3Server::My3Server(QObject *parent) - : Q3ServerSocket(7700, 1, parent), m_socket(0) -{ - if (ok()) - qDebug("qt3server"); - - QTimer::singleShot(5000, this, SLOT(stopServer())); -} - -//------------------------------------------------------------------------------ -void My3Server::newConnection(int socketId) -{ - m_socket = new My3Socket(this); - m_socket->setSocket(socketId); -} - -//------------------------------------------------------------------------------ -void My3Server::stopServer() -{ - if (m_socket) { - qDebug("SUCCESS"); - m_socket->safeShutDown = true; - m_socket->sendTest(42); - } else { - QCoreApplication::instance()->quit(); - } -} -#endif - //------------------------------------------------------------------------------ My4Socket::My4Socket(QObject *parent) : QTcpSocket(parent), safeShutDown(false) @@ -210,19 +129,6 @@ void My4Server::stopServer() Test::Test(Type type) { switch (type) { -#ifdef QT3_SUPPORT - case Qt3Server: { - new My3Server(this); - break; - } - case Qt3Client: { - qDebug("qt3client"); - My3Socket *s = new My3Socket(this); - s->connectToHost("localhost", 7700); - s->sendTest(1); - break; - } -#endif case Qt4Client: { qDebug("qt4client"); My4Socket *s = new My4Socket(this); diff --git a/tests/auto/qtcpsocket/stressTest/Test.h b/tests/auto/qtcpsocket/stressTest/Test.h index f74eda3c79..1aa4d709c2 100644 --- a/tests/auto/qtcpsocket/stressTest/Test.h +++ b/tests/auto/qtcpsocket/stressTest/Test.h @@ -42,48 +42,10 @@ #define TEST_H //------------------------------------------------------------------------------ -// Qt -#ifdef QT3_SUPPORT -#include -#include -#endif #include #include -//------------------------------------------------------------------------------ -#ifdef QT3_SUPPORT -class My3Socket : public Q3Socket -{ - Q_OBJECT -public: - My3Socket(QObject *parent); - - void sendTest(Q_UINT32 num); - bool safeShutDown; - -private slots: - void read(); - void closed(); -}; - -//------------------------------------------------------------------------------ -class My3Server : public Q3ServerSocket -{ - Q_OBJECT -public: - My3Server(QObject *parent = 0); - - void newConnection(int socket); - -private slots: - void stopServer(); - -private: - My3Socket *m_socket; -}; -#endif - //------------------------------------------------------------------------------ class My4Socket : public QTcpSocket { @@ -125,10 +87,6 @@ public: enum Type { Qt4Client, Qt4Server, -#ifdef QT3_SUPPORT - Qt3Client, - Qt3Server -#endif }; Test(Type type); }; diff --git a/tests/auto/qtcpsocket/stressTest/main.cpp b/tests/auto/qtcpsocket/stressTest/main.cpp index 83d175da28..6cff356910 100644 --- a/tests/auto/qtcpsocket/stressTest/main.cpp +++ b/tests/auto/qtcpsocket/stressTest/main.cpp @@ -56,14 +56,8 @@ int main(int argc, char **argv) type = Test::Qt4Client; else if (arg == QLatin1String("qt4server")) type = Test::Qt4Server; -#ifdef QT3_SUPPORT - else if (arg == QLatin1String("qt3client")) - type = Test::Qt3Client; - else if (arg == QLatin1String("qt3server")) - type = Test::Qt3Server; -#endif else { - qDebug("usage: ./stressTest "); + qDebug("usage: ./stressTest "); return 0; } diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro index 7bf5ba0074..e282de1a2e 100644 --- a/tests/auto/qtcpsocket/test/test.pro +++ b/tests/auto/qtcpsocket/test/test.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += core-private network-private SOURCES += ../tst_qtcpsocket.cpp win32: { wince*: { diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index f83c4cf99c..8590ff2154 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -430,7 +430,7 @@ void tst_QTcpSocket::socketsConstructedBeforeEventLoop() earlyConstructedSockets->endPoints[1]->close(); } -void tst_QTcpSocket::earlySocketBytesSent(qint64 bytes) +void tst_QTcpSocket::earlySocketBytesSent(qint64 /* bytes */) { earlyBytesWrittenCount++; } @@ -2167,20 +2167,12 @@ void tst_QTcpSocket::suddenRemoteDisconnect_data() QTest::addColumn("client"); QTest::addColumn("server"); -#ifdef QT3_SUPPORT - QTest::newRow("Qt3 Client <-> Qt3 Server") << QString::fromLatin1("qt3client") << QString::fromLatin1("qt3server"); - QTest::newRow("Qt3 Client <-> Qt4 Server") << QString::fromLatin1("qt3client") << QString::fromLatin1("qt4server"); - QTest::newRow("Qt4 Client <-> Qt3 Server") << QString::fromLatin1("qt4client") << QString::fromLatin1("qt3server"); -#endif - QTest::newRow("Qt4 Client <-> Qt4 Server") << QString::fromLatin1("qt4client") << QString::fromLatin1("qt4server"); } void tst_QTcpSocket::suddenRemoteDisconnect() { -#if defined(Q_OS_WINCE) || defined(Q_OS_VXWORKS) - QSKIP("stressTest subprocess needs Qt3Support", SkipAll); -#elif defined( Q_OS_SYMBIAN ) +#if defined( Q_OS_SYMBIAN ) QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll); #else QFETCH(QString, client); diff --git a/tests/auto/qtessellator/dataparser.cpp b/tests/auto/qtessellator/dataparser.cpp index bd17ee2835..d6566cb2f9 100644 --- a/tests/auto/qtessellator/dataparser.cpp +++ b/tests/auto/qtessellator/dataparser.cpp @@ -98,8 +98,12 @@ static QList parsePoints(const QByteArray &line) QList nums = parseNumbersList(it); QList::const_iterator nitr; for (nitr = nums.begin(); nitr != nums.end(); ++nitr) { - qreal x = *nitr; ++nitr; - Q_ASSERT(nitr != nums.end()); + qreal x = *nitr; + ++nitr; + if (nitr == nums.end()) { + qWarning() << "parsePoints: Even number of co-ordinates required, odd number found: skipping last point"; + break; + } qreal y = *nitr; res.append(QPointF(x, y)); } diff --git a/tests/auto/qtessellator/oldtessellator.cpp b/tests/auto/qtessellator/oldtessellator.cpp index 78f117f3e3..bc24d7e69e 100644 --- a/tests/auto/qtessellator/oldtessellator.cpp +++ b/tests/auto/qtessellator/oldtessellator.cpp @@ -80,19 +80,6 @@ struct QEdge { horizontal = p1.y == p2.y; } - inline qreal xAt(const qreal &y) const - { - Q_ASSERT(p1.y != p2.y); - XFixed yf = XDoubleToFixed(y); - - if (yf == p1.y) - return XFixedToDouble(p1.x); - else if (yf == p2.y) - return XFixedToDouble(p2.x); - - return (!vertical) ? (((y - b)*im)) : pf1.x(); - } - QPointF pf1, pf2; XPointFixed p1, p2; qreal m; @@ -218,7 +205,8 @@ void old_tesselate_polygon(QVector *traps, const QPointF *pg, int pg qreal ymax(INT_MIN/256); //painter.begin(pg, pgSize); - Q_ASSERT(pg[0] == pg[pgSize-1]); + if (pg[0] != pg[pgSize-1]) + qWarning() << Q_FUNC_INFO << "Malformed polygon (first and last points must be identical)"; // generate edge table // qDebug() << "POINTS:"; for (int x = 0; x < pgSize-1; ++x) { @@ -383,7 +371,8 @@ void old_tesselate_polygon(QVector *traps, const QPointF *pg, int pg isects[i].edge = edge; } - Q_ASSERT(isects.size()%2 == 1); + if (isects.size()%2 != 1) + qFatal("%s: number of intersection points must be odd", Q_FUNC_INFO); // sort intersection points qSort(&isects[0], &isects[isects.size()-1], compareIntersections); diff --git a/tests/auto/qtessellator/testtessellator.cpp b/tests/auto/qtessellator/testtessellator.cpp index 339f05ff16..d8d6f6f5af 100644 --- a/tests/auto/qtessellator/testtessellator.cpp +++ b/tests/auto/qtessellator/testtessellator.cpp @@ -42,6 +42,7 @@ #include #include "math.h" +#include class TestTessellator : public QTessellator { @@ -91,7 +92,8 @@ void test_tessellate_polygon_rect(QVector *traps, const QPointF *poi bool winding) { // 5 points per rect - Q_ASSERT(nPoints % 5 == 0); + if (nPoints % 5 != 0) + qWarning() << Q_FUNC_INFO << "multiples of 5 points expected"; TestTessellator t; t.traps = traps; diff --git a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp index 8003c442b7..e885942314 100644 --- a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp +++ b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp @@ -123,14 +123,14 @@ void tst_QTextBoundaryFinder::graphemeBoundaries() if (test.at(pos).unicode() == 0xf7) breakPositions.append(strPos); else - Q_ASSERT(test.at(pos).unicode() == 0xd7); + QVERIFY(test.at(pos).unicode() == 0xd7); ++pos; if (pos < test.length()) { - Q_ASSERT(pos < test.length() - 4); + QVERIFY(pos < test.length() - 4); QString hex = test.mid(pos, 4); bool ok = true; testString.append(QChar(hex.toInt(&ok, 16))); - Q_ASSERT(ok); + QVERIFY(ok); pos += 4; } ++strPos; @@ -176,14 +176,14 @@ void tst_QTextBoundaryFinder::wordBoundaries() if (test.at(pos).unicode() == 0xf7) breakPositions.append(strPos); else - Q_ASSERT(test.at(pos).unicode() == 0xd7); + QVERIFY(test.at(pos).unicode() == 0xd7); ++pos; if (pos < test.length()) { - Q_ASSERT(pos < test.length() - 4); + QVERIFY(pos < test.length() - 4); QString hex = test.mid(pos, 4); bool ok = true; testString.append(QChar(hex.toInt(&ok, 16))); - Q_ASSERT(ok); + QVERIFY(ok); pos += 4; } ++strPos; @@ -228,14 +228,14 @@ void tst_QTextBoundaryFinder::sentenceBoundaries() if (test.at(pos).unicode() == 0xf7) breakPositions.append(strPos); else - Q_ASSERT(test.at(pos).unicode() == 0xd7); + QVERIFY(test.at(pos).unicode() == 0xd7); ++pos; if (pos < test.length()) { - Q_ASSERT(pos < test.length() - 4); + QVERIFY(pos < test.length() - 4); QString hex = test.mid(pos, 4); bool ok = true; testString.append(QChar(hex.toInt(&ok, 16))); - Q_ASSERT(ok); + QVERIFY(ok); pos += 4; } ++strPos; diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 43656c8e84..34d34fa90a 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -106,6 +106,8 @@ private slots: void moreToFromUnicode_data(); void moreToFromUnicode(); + + void shiftJis(); }; void tst_QTextCodec::toUnicode_data() @@ -428,7 +430,7 @@ void tst_QTextCodec::flagCodepointFFFF() const QString input(ch); QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); const QByteArray asDecoded(codec->fromUnicode(input)); QCOMPARE(asDecoded, QByteArray("?")); @@ -465,7 +467,7 @@ void tst_QTextCodec::flagF7808080() const QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); //QVERIFY(!codec->canEncode(QChar(0x1C0000))); @@ -482,7 +484,7 @@ void tst_QTextCodec::flagEFBFBF() const invalidInput[2] = char(0xBF); const QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); { //QVERIFY(!codec->canEncode(QChar(0xFFFF))); @@ -1627,7 +1629,7 @@ void tst_QTextCodec::utf8bom() QFETCH(QString, result); QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); QCOMPARE(codec->toUnicode(data.constData(), data.length(), 0), result); @@ -2236,6 +2238,19 @@ void tst_QTextCodec::moreToFromUnicode() QCOMPARE(testData, cStr); } +void tst_QTextCodec::shiftJis() +{ + QByteArray backslashTilde("\\~"); + QTextCodec* codec = QTextCodec::codecForName("shift_jis"); + QString string = codec->toUnicode(backslashTilde); + QCOMPARE(string.length(), 2); + QCOMPARE(string.at(0), QChar(QLatin1Char('\\'))); + QCOMPARE(string.at(1), QChar(QLatin1Char('~'))); + + QByteArray encoded = codec->fromUnicode(string); + QCOMPARE(encoded, backslashTilde); +} + struct DontCrashAtExit { ~DontCrashAtExit() { QTextCodec *c = QTextCodec::codecForName("utf8"); diff --git a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp index a7a9c056d2..0757e4f2da 100644 --- a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp +++ b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp @@ -260,6 +260,7 @@ void tst_QTextDocumentLayout::floatingTablePageBreak() QTextTableFormat tableFormat; tableFormat.setPosition(QTextFrameFormat::FloatLeft); QTextTable *table = cursor.insertTable(50, 1, tableFormat); + Q_UNUSED(table); // Make height of document 2/3 of the table, fitting the table into two pages QSizeF documentSize = doc->size(); diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro index cef2b300d7..5851763310 100644 --- a/tests/auto/qtextedit/qtextedit.pro +++ b/tests/auto/qtextedit/qtextedit.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += gui-private INCLUDEPATH += ../ HEADERS += diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 992d2f2682..5c1ba114f4 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -76,7 +76,6 @@ Q_DECLARE_METATYPE(QList); #if defined(Q_OS_SYMBIAN) # define SRCDIR "" -#undef QT3_SUPPORT #endif @@ -134,9 +133,6 @@ private slots: void mergeCurrentBlockCharFormat(); void emptyAppend(); void appendOnEmptyDocumentShouldReuseInitialParagraph(); -#ifdef QT3_SUPPORT - void textSemantics(); -#endif void cursorPositionChanged(); void setTextCursor(); #ifndef QT_NO_CLIPBOARD @@ -317,7 +313,7 @@ void tst_QTextEdit::getSetCheck() // void QTextEdit::setFontPointSize(qreal) obj1.setFontPointSize(qreal(1.1)); QCOMPARE(qreal(1.1), obj1.fontPointSize()); - // we currently Q_ASSERT_X in QFont::setPointSizeF for that + // we currently assert in QFont::setPointSizeF for that //obj1.setFontPointSize(0.0); //QCOMPARE(1.1, obj1.fontPointSize()); // Should not accept 0.0 => keep old @@ -327,7 +323,7 @@ void tst_QTextEdit::getSetCheck() QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(99); QCOMPARE(99, obj1.fontWeight()); // Range<1, 99> - /* Q_ASSERT_X in qfont.cpp + /* assertion in qfont.cpp obj1.setFontWeight(INT_MIN); QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(INT_MAX); @@ -705,19 +701,6 @@ void tst_QTextEdit::appendOnEmptyDocumentShouldReuseInitialParagraph() QCOMPARE(blockCount(), 1); } -#ifdef QT3_SUPPORT -void tst_QTextEdit::textSemantics() -{ - ed->setTextFormat(Qt::AutoText); - - ed->setPlainText("Hello World"); - QVERIFY(!Qt::mightBeRichText(ed->text())); - - ed->setHtml("Hey"); - QVERIFY(Qt::mightBeRichText(ed->text())); -} -#endif - class CursorPositionChangedRecorder : public QObject { Q_OBJECT @@ -2064,7 +2047,7 @@ void tst_QTextEdit::compareWidgetAndImage(QTextEdit &widget, const QString &imag QCOMPARE(original.isNull(), false); QCOMPARE(original.size(), image.size()); - Q_ASSERT(image.depth() == 32); + QCOMPARE(image.depth(), 32); QCOMPARE(original.depth(), image.depth()); const int bytesPerLine = image.bytesPerLine(); diff --git a/tests/auto/qtextlayout/qtextlayout.pro b/tests/auto/qtextlayout/qtextlayout.pro index 381f09e5e9..2a180d7937 100644 --- a/tests/auto/qtextlayout/qtextlayout.pro +++ b/tests/auto/qtextlayout/qtextlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private HEADERS += SOURCES += tst_qtextlayout.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp index 997cd683c5..ffce9a21eb 100644 --- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp +++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp @@ -114,11 +114,14 @@ QString tst_QTextOdfWriter::getContentFromXml() xmlWriter->writeEndDocument(); buffer->close(); QString stringContent = QString::fromUtf8(buffer->data()); + QString ret; int index = stringContent.indexOf("', index); - stringContent = stringContent.mid(index+1, stringContent.length() - index - 10); - return stringContent; + if (index > 0) { + index = stringContent.indexOf('>', index); + if (index > 0) + ret = stringContent.mid(index+1, stringContent.length() - index - 10); + } + return ret; } void tst_QTextOdfWriter::testWriteParagraph_data() diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/qtextpiecetable/qtextpiecetable.pro index 0926b83ccc..edcb0a091c 100644 --- a/tests/auto/qtextpiecetable/qtextpiecetable.pro +++ b/tests/auto/qtextpiecetable/qtextpiecetable.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qtextpiecetable.cpp HEADERS += ../qtextdocument/common.h diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp index 6f1b092709..12f17a890b 100644 --- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp +++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp @@ -1108,6 +1108,8 @@ void tst_QTextPieceTable::removeWithChildFrame() QTextFrame *frame = table->insertFrame(1, 6, ffmt); QTextFrame *childFrame = table->insertFrame(3, 5, ffmt); + Q_UNUSED(frame); + Q_UNUSED(childFrame); // used to give a failing assertion table->remove(2, 5); diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data deleted file mode 100644 index 849ecb39ed..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data deleted file mode 100644 index 8b9647f06f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data deleted file mode 100644 index d73722e724..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 849ecb39ed..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 8b9647f06f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index d73722e724..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data deleted file mode 100644 index 4d5bdc553e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data deleted file mode 100644 index 3cf181c23c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data deleted file mode 100644 index f7f74e56a0..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data deleted file mode 100644 index 104e45f940..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data deleted file mode 100644 index 3135276780..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data deleted file mode 100644 index 993d0b9e19..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ -z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ -z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data deleted file mode 100644 index 6def16c99e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data deleted file mode 100644 index 57302ad8e7..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data deleted file mode 100644 index 239c14d498..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data deleted file mode 100644 index 8fbd3327c8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data deleted file mode 100644 index d745e1be7b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index 6def16c99e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 57302ad8e7..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 239c14d498..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 8fbd3327c8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index d745e1be7b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data deleted file mode 100644 index e2b43e3781..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data deleted file mode 100644 index 962fc922ad..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data deleted file mode 100644 index 839cc09ec8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data deleted file mode 100644 index f71ac66a63..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data deleted file mode 100644 index 88f99805e3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ -z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_0.data deleted file mode 100644 index 9ac3ad9a6b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_1.data deleted file mode 100644 index bb28df16b9..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_2.data deleted file mode 100644 index 8c0f57437b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_3.data deleted file mode 100644 index d494004e64..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_4.data deleted file mode 100644 index de421979ea..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data deleted file mode 100644 index 849ecb39ed..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data deleted file mode 100644 index 8b9647f06f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data deleted file mode 100644 index d73722e724..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 849ecb39ed..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 8b9647f06f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index d73722e724..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data deleted file mode 100644 index 4d5bdc553e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data deleted file mode 100644 index 3cf181c23c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data deleted file mode 100644 index f7f74e56a0..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_2.data deleted file mode 100644 index 104e45f940..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_3.data deleted file mode 100644 index 3135276780..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_4.data deleted file mode 100644 index 993d0b9e19..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_0.data deleted file mode 100644 index 6def16c99e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_1.data deleted file mode 100644 index 57302ad8e7..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_2.data deleted file mode 100644 index 239c14d498..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_3.data deleted file mode 100644 index 819b31d1f2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_4.data deleted file mode 100644 index a6ff072af1..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index 6def16c99e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 57302ad8e7..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 239c14d498..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 819b31d1f2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index a6ff072af1..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data deleted file mode 100644 index e2b43e3781..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data deleted file mode 100644 index 962fc922ad..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data deleted file mode 100644 index 839cc09ec8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data deleted file mode 100644 index c33473a370..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data deleted file mode 100644 index def7fcb589..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_0.data deleted file mode 100644 index 9ac3ad9a6b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_1.data deleted file mode 100644 index bb28df16b9..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_2.data deleted file mode 100644 index 8c0f57437b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_3.data deleted file mode 100644 index 878dc8a26e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_4.data deleted file mode 100644 index fd0779e0f3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_1.data deleted file mode 100644 index 67ce8d83c8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_2.data deleted file mode 100644 index 9662a9aaa1..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_3.data deleted file mode 100644 index a74511b101..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_4.data deleted file mode 100644 index bdc06a6ec2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_5.data deleted file mode 100644 index 79b15d4d8a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_6.data deleted file mode 100644 index 2141e65843..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 67ce8d83c8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 9662a9aaa1..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index a74511b101..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index bdc06a6ec2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data deleted file mode 100644 index 79b15d4d8a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data deleted file mode 100644 index 2141e65843..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data deleted file mode 100644 index fb911f7352..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data deleted file mode 100644 index efbc06bf26..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data deleted file mode 100644 index 4d857caa13..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data deleted file mode 100644 index b125e2084f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data deleted file mode 100644 index f39fbde113..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data deleted file mode 100644 index 5436b427ed..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_1.data deleted file mode 100644 index e6b94bbeb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_2.data deleted file mode 100644 index fb0a550264..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_3.data deleted file mode 100644 index 48fe53930f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_4.data deleted file mode 100644 index 811e93212d..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_5.data deleted file mode 100644 index 7041fa9b4d..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_6.data deleted file mode 100644 index 9fd21fade0..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_1.data deleted file mode 100644 index 67ce8d83c8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_2.data deleted file mode 100644 index 9662a9aaa1..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_3.data deleted file mode 100644 index a74511b101..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_4.data deleted file mode 100644 index bdc06a6ec2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 67ce8d83c8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 9662a9aaa1..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index a74511b101..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index bdc06a6ec2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data deleted file mode 100644 index fb911f7352..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data deleted file mode 100644 index efbc06bf26..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data deleted file mode 100644 index 4d857caa13..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data deleted file mode 100644 index b125e2084f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_1.data deleted file mode 100644 index e6b94bbeb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_2.data deleted file mode 100644 index fb0a550264..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_3.data deleted file mode 100644 index 48fe53930f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_4.data deleted file mode 100644 index 811e93212d..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_5.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_6.data deleted file mode 100644 index ea73fac731..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_7.data deleted file mode 100644 index 1f4f1a58de..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_8.data deleted file mode 100644 index 9469ca407f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data deleted file mode 100644 index ea73fac731..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data deleted file mode 100644 index 1f4f1a58de..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data deleted file mode 100644 index 9469ca407f..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data deleted file mode 100644 index 9805422dfb..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data deleted file mode 100644 index 77f557a494..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data deleted file mode 100644 index 8dd6a4b38e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_4.data deleted file mode 100644 index f5a0d874d4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_5.data deleted file mode 100644 index 95742ec8f2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_6.data deleted file mode 100644 index ebb14b2fbd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_7.data deleted file mode 100644 index a9e1432ca9..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_8.data deleted file mode 100644 index b7e6743c28..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_4.data deleted file mode 100644 index 40269f4e0c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_5.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_6.data deleted file mode 100644 index ea73fac731..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_7.data deleted file mode 100644 index 1f4f1a58de..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_8.data deleted file mode 100644 index e8051f8906..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index 40269f4e0c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data deleted file mode 100644 index ea73fac731..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data deleted file mode 100644 index 1f4f1a58de..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data deleted file mode 100644 index e8051f8906..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data deleted file mode 100644 index beea1c3663..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data deleted file mode 100644 index 9805422dfb..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data deleted file mode 100644 index 77f557a494..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data deleted file mode 100644 index be6f22a5ea..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_4.data deleted file mode 100644 index e20c76a82c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_5.data deleted file mode 100644 index 95742ec8f2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_6.data deleted file mode 100644 index ebb14b2fbd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_7.data deleted file mode 100644 index a9e1432ca9..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_8.data deleted file mode 100644 index f8ec5bc443..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_1.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_2.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_4.data deleted file mode 100644 index 0dc83d2713..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index 0dc83d2713..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data deleted file mode 100644 index 584b17ea18..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_1.data deleted file mode 100644 index 95742ec8f2..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_2.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_4.data deleted file mode 100644 index 80d3ca2ef1..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_4.data deleted file mode 100644 index f5a0d874d4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data deleted file mode 100644 index 40269f4e0c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index 40269f4e0c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data deleted file mode 100644 index beea1c3663..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_4.data deleted file mode 100644 index e20c76a82c..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_4.data deleted file mode 100644 index f5a0d874d4..0000000000 Binary files a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data deleted file mode 100644 index 4d5bdc553e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data deleted file mode 100644 index 3cf181c23c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data deleted file mode 100644 index f7f74e56a0..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 849ecb39ed..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 8b9647f06f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index d73722e724..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data deleted file mode 100644 index 4d5bdc553e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data deleted file mode 100644 index 3cf181c23c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data deleted file mode 100644 index f7f74e56a0..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data deleted file mode 100644 index 104e45f940..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data deleted file mode 100644 index 3135276780..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data deleted file mode 100644 index 993d0b9e19..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ -z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ -z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data deleted file mode 100644 index e2b43e3781..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data deleted file mode 100644 index 962fc922ad..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data deleted file mode 100644 index 839cc09ec8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data deleted file mode 100644 index f71ac66a63..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data deleted file mode 100644 index 88f99805e3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index 6def16c99e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 57302ad8e7..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 239c14d498..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 8fbd3327c8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index d745e1be7b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data deleted file mode 100644 index e2b43e3781..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data deleted file mode 100644 index 962fc922ad..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data deleted file mode 100644 index 839cc09ec8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data deleted file mode 100644 index f71ac66a63..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data deleted file mode 100644 index 88f99805e3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ -z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_0.data deleted file mode 100644 index 9ac3ad9a6b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_1.data deleted file mode 100644 index bb28df16b9..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_2.data deleted file mode 100644 index 8c0f57437b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_3.data deleted file mode 100644 index d494004e64..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_4.data deleted file mode 100644 index de421979ea..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data deleted file mode 100644 index 4d5bdc553e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data deleted file mode 100644 index 3cf181c23c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data deleted file mode 100644 index f7f74e56a0..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 849ecb39ed..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 8b9647f06f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index d73722e724..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data deleted file mode 100644 index 4d5bdc553e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data deleted file mode 100644 index 3cf181c23c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data deleted file mode 100644 index f7f74e56a0..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_2.data deleted file mode 100644 index 104e45f940..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_3.data deleted file mode 100644 index 3135276780..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_4.data deleted file mode 100644 index 993d0b9e19..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_0.data deleted file mode 100644 index e2b43e3781..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_1.data deleted file mode 100644 index 962fc922ad..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_2.data deleted file mode 100644 index 839cc09ec8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_3.data deleted file mode 100644 index c33473a370..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_4.data deleted file mode 100644 index def7fcb589..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index 6def16c99e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 57302ad8e7..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 239c14d498..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 819b31d1f2..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index a6ff072af1..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data deleted file mode 100644 index e2b43e3781..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data deleted file mode 100644 index 962fc922ad..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data deleted file mode 100644 index 839cc09ec8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data deleted file mode 100644 index c33473a370..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data deleted file mode 100644 index def7fcb589..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_0.data deleted file mode 100644 index 9ac3ad9a6b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_1.data deleted file mode 100644 index bb28df16b9..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_2.data deleted file mode 100644 index 8c0f57437b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_3.data deleted file mode 100644 index 878dc8a26e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_4.data deleted file mode 100644 index fd0779e0f3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_1.data deleted file mode 100644 index fb911f7352..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_2.data deleted file mode 100644 index efbc06bf26..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_3.data deleted file mode 100644 index 4d857caa13..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_4.data deleted file mode 100644 index b125e2084f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_5.data deleted file mode 100644 index f39fbde113..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_6.data deleted file mode 100644 index 5436b427ed..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 67ce8d83c8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 9662a9aaa1..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index a74511b101..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index bdc06a6ec2..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data deleted file mode 100644 index 79b15d4d8a..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data deleted file mode 100644 index 2141e65843..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data deleted file mode 100644 index fb911f7352..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data deleted file mode 100644 index efbc06bf26..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data deleted file mode 100644 index 4d857caa13..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data deleted file mode 100644 index b125e2084f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data deleted file mode 100644 index f39fbde113..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data deleted file mode 100644 index 5436b427ed..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_1.data deleted file mode 100644 index e6b94bbeb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_2.data deleted file mode 100644 index fb0a550264..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_3.data deleted file mode 100644 index 48fe53930f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_4.data deleted file mode 100644 index 811e93212d..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_5.data deleted file mode 100644 index 7041fa9b4d..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_6.data deleted file mode 100644 index 9fd21fade0..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_1.data deleted file mode 100644 index fb911f7352..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_2.data deleted file mode 100644 index efbc06bf26..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_3.data deleted file mode 100644 index 4d857caa13..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_4.data deleted file mode 100644 index b125e2084f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 67ce8d83c8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 9662a9aaa1..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index a74511b101..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index bdc06a6ec2..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data deleted file mode 100644 index fb911f7352..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data deleted file mode 100644 index efbc06bf26..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data deleted file mode 100644 index 4d857caa13..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data deleted file mode 100644 index b125e2084f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_1.data deleted file mode 100644 index e6b94bbeb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_2.data deleted file mode 100644 index fb0a550264..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_3.data deleted file mode 100644 index 48fe53930f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_4.data deleted file mode 100644 index 811e93212d..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_5.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_6.data deleted file mode 100644 index 9805422dfb..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_7.data deleted file mode 100644 index 77f557a494..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_8.data deleted file mode 100644 index 8dd6a4b38e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data deleted file mode 100644 index ea73fac731..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data deleted file mode 100644 index 1f4f1a58de..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data deleted file mode 100644 index 9469ca407f..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data deleted file mode 100644 index 9805422dfb..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data deleted file mode 100644 index 77f557a494..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data deleted file mode 100644 index 8dd6a4b38e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_4.data deleted file mode 100644 index f5a0d874d4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_5.data deleted file mode 100644 index 95742ec8f2..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_6.data deleted file mode 100644 index ebb14b2fbd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_7.data deleted file mode 100644 index a9e1432ca9..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_8.data deleted file mode 100644 index b7e6743c28..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_4.data deleted file mode 100644 index beea1c3663..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_5.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_6.data deleted file mode 100644 index 9805422dfb..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_7.data deleted file mode 100644 index 77f557a494..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_8.data deleted file mode 100644 index be6f22a5ea..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index 40269f4e0c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data deleted file mode 100644 index ea73fac731..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data deleted file mode 100644 index 1f4f1a58de..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data deleted file mode 100644 index e8051f8906..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data deleted file mode 100644 index beea1c3663..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data deleted file mode 100644 index 9805422dfb..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data deleted file mode 100644 index 77f557a494..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data deleted file mode 100644 index be6f22a5ea..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_4.data deleted file mode 100644 index e20c76a82c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_5.data deleted file mode 100644 index 95742ec8f2..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_5.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_6.data deleted file mode 100644 index ebb14b2fbd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_6.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_7.data deleted file mode 100644 index a9e1432ca9..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_7.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_8.data deleted file mode 100644 index f8ec5bc443..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_8.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_1.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_2.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_4.data deleted file mode 100644 index 584b17ea18..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 396352f4d6..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index 0dc83d2713..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data deleted file mode 100644 index 73f5f259f8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data deleted file mode 100644 index 584b17ea18..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_1.data deleted file mode 100644 index 95742ec8f2..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_2.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_4.data deleted file mode 100644 index 80d3ca2ef1..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_4.data deleted file mode 100644 index f5a0d874d4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data deleted file mode 100644 index beea1c3663..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index 40269f4e0c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data deleted file mode 100644 index beea1c3663..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_4.data deleted file mode 100644 index e20c76a82c..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index feac21f921..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index 815d4fc7db..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data deleted file mode 100644 index c933a04c07..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data deleted file mode 100644 index 69de5ef2bd..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data deleted file mode 100644 index c45139955a..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data deleted file mode 100644 index 775ae0f25b..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data deleted file mode 100644 index ee113d1cf3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data deleted file mode 100644 index 1e07040ef4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data deleted file mode 100644 index cc7ab7dff8..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data deleted file mode 100644 index 450072bc4e..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B \ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_0.data deleted file mode 100644 index 379e87b914..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_0.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_1.data deleted file mode 100644 index 2785156fb3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_1.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_2.data deleted file mode 100644 index 6dc818abc3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_2.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_3.data deleted file mode 100644 index d41a1f75d3..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_3.data and /dev/null differ diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_4.data deleted file mode 100644 index f5a0d874d4..0000000000 Binary files a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_4.data and /dev/null differ diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp index 2d7c24d238..b086a213c8 100644 --- a/tests/auto/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/qtextstream/tst_qtextstream.cpp @@ -243,45 +243,6 @@ private slots: void generateBOM(); void readBomSeekBackReadBomAgain(); - // old tests -#ifdef QT3_SUPPORT - void qt3_operator_shiftleft_data(); - void qt3_operator_shiftleft(); - void qt3_operator_shiftright_data(); - void qt3_operator_shiftright(); - void qt3_operator_shift_QChar_data(); - void qt3_operator_shift_QChar(); - void qt3_operator_shift_char_data(); - void qt3_operator_shift_char(); - void qt3_operator_shift_short_data(); - void qt3_operator_shift_short(); - void qt3_operator_shift_ushort_data(); - void qt3_operator_shift_ushort(); - void qt3_operator_shift_int_data(); - void qt3_operator_shift_int(); - void qt3_operator_shift_uint_data(); - void qt3_operator_shift_uint(); - void qt3_operator_shift_long_data(); - void qt3_operator_shift_long(); - void qt3_operator_shift_ulong_data(); - void qt3_operator_shift_ulong(); - void qt3_operator_shift_float_data(); - void qt3_operator_shift_float(); - void qt3_operator_shift_double_data(); - void qt3_operator_shift_double(); - void qt3_operator_shift_QString_data(); - void qt3_operator_shift_QString(); - void qt3_operator_shift_QByteArray_data(); - void qt3_operator_shift_QByteArray(); - - void qt3_writeDataToFileReadAsLines_data(); - void qt3_writeDataToFileReadAsLines(); - void qt3_writeDataToQStringReadAsLines_data(); - void qt3_writeDataToQStringReadAsLines(); - - void qt3_readLineFromString(); -#endif - // task-specific tests void task180679_alignAccountingStyle(); void task178772_setCodec(); @@ -294,54 +255,6 @@ private: void generateRealNumbersData(bool for_QString); void generateStringData(bool for_QString); void generateRealNumbersDataWrite(); - - // Qt 3 privates -#ifdef QT3_SUPPORT - void qt3_createWriteStream( QTextStream *&os ); - void qt3_closeWriteStream( QTextStream *os ); - void qt3_createReadStream( QTextStream *&is ); - void qt3_closeReadStream( QTextStream *is ); - void qt3_read_QChar( QTextStream *s ); - void qt3_write_QChar( QTextStream *s ); - void qt3_read_char( QTextStream *s ); - void qt3_write_char( QTextStream *s ); - void qt3_read_short( QTextStream *s ); - void qt3_write_short( QTextStream *s ); - void qt3_read_ushort( QTextStream *s ); - void qt3_write_ushort( QTextStream *s ); - void qt3_read_int( QTextStream *s ); - void qt3_write_int( QTextStream *s ); - void qt3_read_uint( QTextStream *s ); - void qt3_write_uint( QTextStream *s ); - void qt3_read_long( QTextStream *s ); - void qt3_write_long( QTextStream *s ); - void qt3_read_ulong( QTextStream *s ); - void qt3_write_ulong( QTextStream *s ); - void qt3_read_float( QTextStream *s ); - void qt3_write_float( QTextStream *s ); - void qt3_read_double( QTextStream *s ); - void qt3_write_double( QTextStream *s ); - void qt3_read_QString( QTextStream *s ); - void qt3_write_QString( QTextStream *s ); - void qt3_read_QByteArray( QTextStream *s ); - void qt3_write_QByteArray( QTextStream *s ); - void qt3_operatorShift_data( QIODevice::OpenMode ); - void qt3_do_shiftleft( QTextStream *ts ); - QTextStream::Encoding qt3_toEncoding( const QString& ); - QString qt3_decodeString( QByteArray array, const QString& encoding ); -#endif - - // Qt 3 data - QTextStream *os; - QTextStream *is; - QTextStream *ts; - QFile *inFile; - QFile *inResource; - QFile *outFile; - QByteArray *inArray; - QBuffer *inBuffer; - QString *inString; - bool file_is_empty; }; // Testing get/set functions @@ -465,18 +378,6 @@ void tst_QTextStream::getSetCheck() tst_QTextStream::tst_QTextStream() { - // Initialize Qt 3 data - ts = 0; - os = 0; - is = 0; - outFile = 0; - inFile = 0; - inResource = 0; - inArray = 0; - inBuffer = 0; - inString = 0; - file_is_empty = FALSE; - Q_SET_DEFAULT_IAP } @@ -486,41 +387,10 @@ tst_QTextStream::~tst_QTextStream() void tst_QTextStream::init() { - // Initialize Qt 3 data - ts = 0; - os = 0; - is = 0; - inFile = 0; - inResource = 0; - outFile = 0; - inArray = 0; - inBuffer = 0; - inString = 0; - file_is_empty = FALSE; } void tst_QTextStream::cleanup() { - // Clean up Qt 3 data - delete ts; - ts = 0; - delete os; - os = 0; - delete is; - is = 0; - delete inResource; - inResource = 0; - delete inFile; - inFile = 0; - delete outFile; - outFile = 0; - delete inArray; - inArray = 0; - delete inBuffer; - inBuffer = 0; - delete inString; - inString = 0; - QCoreApplication::instance()->processEvents(); } @@ -2710,7 +2580,7 @@ void tst_QTextStream::readBomSeekBackReadBomAgain() QFile::remove("utf8bom"); QFile file("utf8bom"); QVERIFY(file.open(QFile::ReadWrite)); - file.write("\xef\xbb\xbf""Andreas"); + file.write("\xef\xbb\xbf" "Andreas"); file.seek(0); QCOMPARE(file.pos(), qint64(0)); @@ -2724,1416 +2594,6 @@ void tst_QTextStream::readBomSeekBackReadBomAgain() QCOMPARE(Andreas, QString("Andreas")); } -// ------------------------------------------------------------------------------ -// QT 3 tests -// ------------------------------------------------------------------------------ -#ifdef QT3_SUPPORT - -void tst_QTextStream::qt3_readLineFromString() -{ - QString data = "line 1e\nline 2e\nline 3e"; - QStringList list; - QTextStream stream(&data, QIODevice::ReadOnly); - stream.setCodec(QTextCodec::codecForName("ISO-8859-1")); - stream.setAutoDetectUnicode(true); - - while (!stream.atEnd()) { - QString line = stream.readLine(); - QCOMPARE(QChar(line[line.size()-1]), QChar('e')); - list << line; - } - QVERIFY(list.count() == 3); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftright_data() -{ - qt3_operatorShift_data( QIODevice::ReadOnly ); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftleft_data() -{ - qt3_operatorShift_data( QIODevice::WriteOnly ); -} - -static const double doubleDummy = 567.89; -static const int intDummy = 1234; -static const QString stringDummy = "ABCD"; - -struct tst_IODevice { - char *n; - QIODevice::OpenModeFlag modes; - QString name() const { return QString::fromLatin1(n); } -} devices[] = { - { "file", QIODevice::ReadWrite }, - { "bytearray", QIODevice::ReadWrite }, - { "buffer", QIODevice::ReadWrite }, - { "string", QIODevice::ReadWrite }, - { "resource", QIODevice::ReadOnly }, //See discussion (resources) below - { 0, (QIODevice::OpenModeFlag)0 } -}; - -/* Resources: - - This will test QTextStream's ability to interact with resources, - however the trouble is the resources must be created correctly and - built into the executable (but this executable also creates the - resource files). So there is a chicken and egg problem, to create - resources (if the file formats change at all): - - 1) p4 edit resources/... - - 2) Change QIODevice::ReadOnly above in the devices[] for "resource" - to QIODevice::WriteOnly - - 3) run the test - - 4) revert this file, qmake, make, and run again. - - 5) Enjoy. -*/ - -static inline QString resourceDir() -{ - QString ret = "resources/"; - if(QSysInfo::ByteOrder == QSysInfo::BigEndian) - ret += "big_endian/"; - else - ret += "little_endian/"; - return ret; -} - -static const char *const encodings[] = { - "Locale", - "Latin1", - "Unicode", - "UnicodeNetworkOrder", - "UnicodeReverse", - "RawUnicode", - "UnicodeUTF8", - 0 -}; - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operatorShift_data( QIODevice::OpenMode mode ) -{ - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("type"); - QTest::addColumn("doubleVal"); - QTest::addColumn("intVal"); - QTest::addColumn("stringVal"); - QTest::addColumn("encoded"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - if(!(device->modes & mode)) - continue; - - /* - We first test each type at least once. - */ - QTest::newRow( device->name() + "0" ) << device->name() << QString("UnicodeUTF8") << QString("QChar") - << doubleDummy << (int) 'Z' << stringDummy - << QByteArray( QByteArray("Z") ); - QTest::newRow( device->name() + "1" ) << device->name() << QString("UnicodeUTF8") << QString("char") - << doubleDummy << (int) 'Z' << stringDummy - << QByteArray( QByteArray("Z") ); - QTest::newRow( device->name() + "2" ) << device->name() << QString("UnicodeUTF8") << QString("signed short") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "3" ) << device->name() << QString("UnicodeUTF8") << QString("unsigned short") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "4" ) << device->name() << QString("UnicodeUTF8") << QString("signed int") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "5" ) << device->name() << QString("UnicodeUTF8") << QString("unsigned int") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "6" ) << device->name() << QString("UnicodeUTF8") << QString("signed long") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "7" ) << device->name() << QString("UnicodeUTF8") << QString("unsigned long") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "8" ) << device->name() << QString("UnicodeUTF8") << QString("float") - << (double)3.1415f << intDummy << stringDummy - << QByteArray( QByteArray("3.1415") ); - QTest::newRow( device->name() + "9" ) << device->name() << QString("UnicodeUTF8") << QString("double") - << 3.1415 << intDummy << stringDummy - << QByteArray( QByteArray("3.1415") ); - QTest::newRow( device->name() + "10" ) << device->name() << QString("UnicodeUTF8") << QString("char *") - << doubleDummy << intDummy << QString("I-am-a-string") - << QByteArray( QByteArray("I-am-a-string") ); - QTest::newRow( device->name() + "11" ) << device->name() << QString("UnicodeUTF8") << QString("QString") - << doubleDummy << intDummy << QString("I-am-a-string") - << QByteArray( QByteArray("I-am-a-string") ); - QTest::newRow( device->name() + "12" ) << device->name() << QString("UnicodeUTF8") << QString("QByteArray") - << doubleDummy << intDummy << QString("I-am-a-string") - << QByteArray( QByteArray("I-am-a-string") ); - - /* - Then we test some special cases that have caused problems in the past. - */ - QTest::newRow( device->name() + "20" ) << device->name() << QString("UnicodeUTF8") << QString("QChar") - << doubleDummy << 0xff8c << stringDummy - << QByteArray( QByteArray("\xef\xbe\x8c") ); - QTest::newRow( device->name() + "21" ) << device->name() << QString("UnicodeUTF8") << QString("QChar") - << doubleDummy << 0x8cff << stringDummy - << QByteArray( QByteArray("\xe8\xb3\xbf") ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_do_shiftleft( QTextStream *ts ) -{ - QFETCH( QString, encoding ); - QFETCH( QString, type ); - QFETCH( double, doubleVal ); - QFETCH( int, intVal ); - QFETCH( QString, stringVal ); - - ts->setEncoding( qt3_toEncoding(encoding) ); - - if ( type == "QChar" ) { - if ( intVal >= 0 && intVal <= 0xffff ) - *ts << QChar( intVal ); - } else if ( type == "char" ) { - *ts << (char) intVal; - } else if ( type == "signed short" ) { - *ts << (signed short) intVal; - } else if ( type == "unsigned short" ) { - *ts << (unsigned short) intVal; - } else if ( type == "signed int" ) { - *ts << (signed int) intVal; - } else if ( type == "unsigned int" ) { - *ts << (unsigned int) intVal; - } else if ( type == "signed long" ) { - *ts << (signed long) intVal; - } else if ( type == "unsigned long" ) { - *ts << (unsigned long) intVal; - } else if ( type == "float" ) { - *ts << (float) doubleVal; - } else if ( type == "double" ) { - *ts << (double) doubleVal; - } else if ( type == "char *" ) { - *ts << stringVal.latin1(); - } else if ( type == "QString" ) { - *ts << stringVal; - } else if ( type == "QByteArray" ) { - *ts << QByteArray( stringVal.latin1() ); - } else { - QWARN( "Unknown type: %s" + type ); - } - - ts->flush(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftleft() -{ - QFETCH( QString, device ); - QFETCH( QString, encoding ); - QFETCH( QByteArray, encoded ); - - if ( device == "file" ) { - QFile outFile( "qtextstream.out" ); - QVERIFY( outFile.open( QIODevice::WriteOnly ) ); - QTextStream ts( &outFile ); - - qt3_do_shiftleft( &ts ); - outFile.close(); - - QFile inFile( "qtextstream.out" ); - QVERIFY( inFile.open( QIODevice::ReadOnly ) ); - QCOMPARE( inFile.readAll().constData(), encoded.constData() ); - } else if(device == "resource" ) { //ONLY TO CREATE THE RESOURCE!! NOT A TEST! - QFile outFile( resourceDir() + "operator_shiftright_" + QTest::currentDataTag() + ".data" ); - QVERIFY( outFile.open( QIODevice::WriteOnly ) ); - QTextStream ts( &outFile ); - qt3_do_shiftleft( &ts ); - outFile.close(); - } else if ( device == "bytearray" ) { - QByteArray outArray; - QTextStream ts(&outArray, QIODevice::WriteOnly ); - - qt3_do_shiftleft( &ts ); - - QVERIFY( outArray == encoded ); - } else if ( device == "buffer" ) { - QByteArray outArray; - QBuffer outBuffer(&outArray); - QVERIFY( outBuffer.open(QIODevice::WriteOnly) ); - QTextStream ts( &outBuffer ); - - qt3_do_shiftleft( &ts ); - - QCOMPARE( outArray, encoded ); - } else if ( device == "string" ) { - QString outString; - QTextStream ts( &outString, QIODevice::WriteOnly ); - - qt3_do_shiftleft( &ts ); - - QString decodedString = qt3_decodeString( encoded, encoding ); - QCOMPARE( outString, decodedString ); - } else { - QWARN( "Unknown device type: " + device ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftright() -{ - QFETCH( QString, device ); - QFETCH( QString, encoding ); - QFETCH( QString, type ); - QFETCH( double, doubleVal ); - QFETCH( int, intVal ); - QFETCH( QString, stringVal ); - QFETCH( QByteArray, encoded ); - - if ( device == "file" ) { - QFile outFile( "qtextstream.out" ); - QVERIFY( outFile.open( QIODevice::WriteOnly ) ); - QVERIFY( (int) outFile.write(encoded) == (int) encoded.size() ); - outFile.close(); - - inFile = new QFile( "qtextstream.out" ); - QVERIFY( inFile->open( QIODevice::ReadOnly ) ); - ts = new QTextStream( inFile ); - } else if(device == "resource" ) { - inResource = new QFile( ":/tst_textstream/" + resourceDir() + "operator_shiftright_" + QTest::currentDataTag() + ".data" ); - QVERIFY( inResource->open( QIODevice::ReadOnly ) ); - ts = new QTextStream( inResource ); - } else if ( device == "bytearray" ) { - ts = new QTextStream(&encoded, QIODevice::ReadOnly); - } else if ( device == "buffer" ) { - inBuffer = new QBuffer(&encoded); - QVERIFY( inBuffer->open(QIODevice::ReadOnly) ); - ts = new QTextStream( inBuffer ); - } else if ( device == "string" ) { - inString = new QString( qt3_decodeString(encoded, encoding) ); - ts = new QTextStream(inString, QIODevice::ReadOnly); - } else { - QWARN( "Unknown device type: " + device ); - } - - ts->setEncoding( qt3_toEncoding(encoding) ); - - if ( type == "QChar" ) { - QChar c; - if ( intVal >= 0 && intVal <= 0xffff ) - *ts >> c; - QCOMPARE( c.toLatin1(), QChar(intVal).toLatin1() ); - } else if ( type == "char" ) { - char c; - *ts >> c; - QCOMPARE( c, (char) intVal ); - } else if ( type == "signed short" ) { - signed short h; - *ts >> h; - QCOMPARE( h, (signed short) intVal ); - } else if ( type == "unsigned short" ) { - unsigned short h; - *ts >> h; - QCOMPARE( h, (unsigned short) intVal ); - } else if ( type == "signed int" ) { - signed int i; - *ts >> i; - QCOMPARE( i, (signed int) intVal ); - } else if ( type == "unsigned int" ) { - unsigned int i; - *ts >> i; - QCOMPARE( i, (unsigned int) intVal ); - } else if ( type == "signed long" ) { - signed long ell; - *ts >> ell; - QCOMPARE( ell, (signed long) intVal ); - } else if ( type == "unsigned long" ) { - unsigned long ell; - *ts >> ell; - QCOMPARE( ell, (unsigned long) intVal ); - } else if ( type == "float" ) { - float f; - *ts >> f; - QCOMPARE( f, (float) doubleVal ); - } else if ( type == "double" ) { - double d; - *ts >> d; - QCOMPARE( d, (double) doubleVal ); - } else if ( type == "char *" ) { - char *cp = new char[2048]; - *ts >> cp; - QVERIFY( qstrcmp(cp, stringVal.latin1()) == 0 ); - delete[] cp; - } else if ( type == "QString" ) { - QString s; - *ts >> s; - QCOMPARE( s, stringVal ); - } else if ( type == "QByteArray" ) { - QByteArray s; - *ts >> s; - QCOMPARE( QString::fromLatin1(s), stringVal ); - } else { - QWARN( "Unknown type: %s" + type ); - } -} - -// ------------------------------------------------------------------------------ -QTextStream::Encoding tst_QTextStream::qt3_toEncoding( const QString &str ) -{ - if ( str == "Locale" ) - return QTextStream::Locale; - else if ( str == "Latin1" ) - return QTextStream::Latin1; - else if ( str == "Unicode" ) - return QTextStream::Unicode; - else if ( str == "UnicodeNetworkOrder" ) - return QTextStream::UnicodeNetworkOrder; - else if ( str == "UnicodeReverse" ) - return QTextStream::UnicodeReverse; - else if ( str == "RawUnicode" ) - return QTextStream::RawUnicode; - else if ( str == "UnicodeUTF8" ) - return QTextStream::UnicodeUTF8; - - QWARN( "No such encoding " + str ); - return QTextStream::Latin1; -} - -// ------------------------------------------------------------------------------ -QString tst_QTextStream::qt3_decodeString( QByteArray array, const QString& encoding ) -{ - switch ( qt3_toEncoding(encoding) ) { - case QTextStream::Locale: - return QString::fromLocal8Bit( array.data(), array.size() ); - case QTextStream::Latin1: - return QString::fromLatin1( array.data(), array.size() ); - case QTextStream::Unicode: - case QTextStream::UnicodeNetworkOrder: - case QTextStream::UnicodeReverse: - case QTextStream::RawUnicode: - QWARN( "Unicode not implemented ###" ); - return QString(); - case QTextStream::UnicodeUTF8: - return QString::fromUtf8( array.data(), array.size() ); - default: - QWARN( "Unhandled encoding" ); - return QString(); - } -} - -// ************************************************ - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_createWriteStream( QTextStream *&os ) -{ - QFETCH( QString, device ); - - if ( device == "file" ) { - outFile = new QFile( "qtextstream.out" ); - QVERIFY( outFile->open( QIODevice::WriteOnly ) ); - os = new QTextStream( outFile ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if(device == "resource" ) { //ONLY TO CREATE THE RESOURCE!! NOT A TEST! - outFile = new QFile( resourceDir() + - QTest::currentTestFunction() + - "_" + QTest::currentDataTag() + ".data" ); - QVERIFY( outFile->open( QIODevice::WriteOnly ) ); - os = new QTextStream( outFile ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if ( device == "bytearray" ) { - inArray = new QByteArray; - os = new QTextStream(inArray, QIODevice::WriteOnly); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if ( device == "buffer" ) { - inBuffer = new QBuffer; - QVERIFY( inBuffer->open(QIODevice::WriteOnly) ); - os = new QTextStream( inBuffer ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if ( device == "string" ) { - inString = new QString; - os = new QTextStream( inString, QIODevice::WriteOnly ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else { - QWARN( "Error creating write stream: Unknown device type '" + device + "'" ); - } - - QFETCH( QString, encoding ); - os->setEncoding( qt3_toEncoding( encoding )); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_closeWriteStream( QTextStream *os ) -{ - QFETCH( QString, device ); - - os->flush(); - if ( os->device() ) - os->device()->close(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_createReadStream( QTextStream *&is ) -{ - QFETCH( QString, device ); - - if ( device == "file" ) { - inFile = new QFile( "qtextstream.out" ); - is = new QTextStream( inFile ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - QVERIFY( inFile->open( QIODevice::ReadOnly ) ); - } else if(device == "resource") { - inResource = new QFile( ":/tst_textstream/" + resourceDir() + - QTest::currentTestFunction() + - "_" + QTest::currentDataTag() + ".data" ); - is = new QTextStream( inResource ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - QVERIFY( inResource->open( QIODevice::ReadOnly ) ); - } else if ( device == "bytearray" ) { - is = new QTextStream(inArray, QIODevice::ReadOnly); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - } else if ( device == "buffer" ) { - QVERIFY( inBuffer->open(QIODevice::ReadOnly) ); - is = new QTextStream( inBuffer ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - } else if ( device == "string" ) { - is = new QTextStream( inString, QIODevice::ReadOnly ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - } else { - QWARN( "Error creating read stream: Unknown device type '" + device + "'" ); - } - - QFETCH( QString, encoding ); - is->setEncoding( qt3_toEncoding( encoding )); - - if (!file_is_empty) { - QVERIFY( !is->atEnd() ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_closeReadStream( QTextStream *is ) -{ - QVERIFY( is->atEnd() ); - - if ( is->device() ) - is->device()->close(); -} - -// **************** QChar **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QChar_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("qchar"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << QChar( 'A' ).unicode(); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << QChar( 'B' ).unicode(); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << QChar( 'Z' ).unicode(); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << QChar( 'z' ).unicode(); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << QChar( '@' ).unicode(); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QChar() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_QChar( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_QChar( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_QChar( QTextStream *s ) -{ - QFETCH( ushort, qchar ); - QChar expected( qchar ); - QChar actual; - *s >> actual; - QCOMPARE( actual, expected ); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_QChar( QTextStream *s ) -{ - QFETCH( ushort, qchar ); - QChar actual( qchar ); - *s << actual; -} - -// **************** char **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_char_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("ch"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << int('A'); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << int('B'); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << int('Z'); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << int(14); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << int('0'); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_char() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_char( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_char( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_char( QTextStream *s ) -{ - QFETCH( int, ch ); - char c(ch); - char exp; - *s >> exp; - QCOMPARE( exp, c ); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_char( QTextStream *s ) -{ - QFETCH( int, ch ); - char c(ch); - *s << c; -} - -// **************** short **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_short_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("ss"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << short(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << short(-1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << short(1); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << short(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << short(-254); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_short() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_short( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_short( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_short( QTextStream *s ) -{ - QFETCH( short, ss ); - short exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, ss ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_short( QTextStream *s ) -{ - QFETCH( short, ss ); - *s << " A " << ss << " B "; -} - -// **************** ushort **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ushort_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("us"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << ushort(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << ushort(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << ushort(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << ushort(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << ushort(512); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ushort() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_ushort( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_ushort( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_ushort( QTextStream *s ) -{ - QFETCH( ushort, us ); - ushort exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, us ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_ushort( QTextStream *s ) -{ - QFETCH( ushort, us ); - *s << " A " << us << " B "; -} - -// **************** int **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_int_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("si"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << int(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << int(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << int(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << int(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << int(512); - QTest::newRow( tag + "5" ) << device->modes << device->name() << encoding << int(-1); - QTest::newRow( tag + "6" ) << device->modes << device->name() << encoding << int(-10); - QTest::newRow( tag + "7" ) << device->modes << device->name() << encoding << int(-255); - QTest::newRow( tag + "8" ) << device->modes << device->name() << encoding << int(-512); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_int() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_int( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_int( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_int( QTextStream *s ) -{ - QFETCH( int, si ); - int exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, si ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_int( QTextStream *s ) -{ - QFETCH( int, si ); - *s << " A " << si << " B "; -} - -// **************** uint **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_uint_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("ui"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << uint(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << uint(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << uint(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << uint(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << uint(512); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_uint() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_uint( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_uint( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_uint( QTextStream *s ) -{ - QFETCH( uint, ui ); - uint exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, ui ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_uint( QTextStream *s ) -{ - QFETCH( uint, ui ); - *s << " A " << ui << " B "; -} - -// **************** long **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_long_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("sl"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << long(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << long(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << long(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << long(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << long(65535); - QTest::newRow( tag + "5" ) << device->modes << device->name() << encoding << long(-1); - QTest::newRow( tag + "6" ) << device->modes << device->name() << encoding << long(-10); - QTest::newRow( tag + "7" ) << device->modes << device->name() << encoding << long(-255); - QTest::newRow( tag + "8" ) << device->modes << device->name() << encoding << long(-65534); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_long() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_long( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_long( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_long( QTextStream *s ) -{ - QFETCH( long, sl ); - long exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, sl ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_long( QTextStream *s ) -{ - QFETCH( long, sl ); - *s << " A " << sl << " B "; -} - -// **************** long **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ulong_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("ul"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << ulong(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << ulong(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << ulong(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << ulong(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << ulong(65535); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ulong() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_ulong( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_ulong( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_ulong( QTextStream *s ) -{ - QFETCH( ulong, ul ); - ulong exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, ul ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_ulong( QTextStream *s ) -{ - QFETCH( ulong, ul ); - *s << " A " << ul << " B "; -} - -// **************** float **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_float_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("f"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << float(0.0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << float(0.0001); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << float(-0.0001); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << float(3.45678); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << float(-3.45678); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_float() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_float( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_float( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_float( QTextStream *s ) -{ - QFETCH( float, f ); - float exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, f ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_float( QTextStream *s ) -{ - QFETCH( float, f ); - *s << " A " << f << " B "; -} - -// **************** double **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_double_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("d"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << double(0.0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << double(0.0001); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << double(-0.0001); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << double(3.45678); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << double(-3.45678); - QTest::newRow( tag + "5" ) << device->modes << device->name() << encoding << double(1.23456789); - QTest::newRow( tag + "6" ) << device->modes << device->name() << encoding << double(-1.23456789); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_double() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - os->precision( 10 ); - qt3_write_double( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - is->precision( 10 ); - qt3_read_double( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_double( QTextStream *s ) -{ - QFETCH( double, d ); - double exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, d ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_double( QTextStream *s ) -{ - QFETCH( double, d ); - *s << " A " << d << " B "; -} - -// **************** QString **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QString_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("str"); - QTest::addColumn("multi_str"); - QTest::addColumn("zero_length"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << QString("") << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << QString() << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << QString("foo") << bool(FALSE) << bool(FALSE); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << QString("foo\nbar") << bool(TRUE) << bool(FALSE); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << QString("cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv") << bool(TRUE) << bool(FALSE); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QString() -{ - QFETCH( bool, zero_length ); - file_is_empty = zero_length; - - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_QString( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_QString( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_QString( QTextStream *s ) -{ - QString exp; - QFETCH( QString, str ); - if (str.isNull()) - str = ""; - - QFETCH( bool, multi_str ); - if (!multi_str) { - *s >> exp; - QCOMPARE( exp, str ); - } else { - QStringList l; - l = QStringList::split( " ", str ); - if (l.count() < 2) - l = QStringList::split( "\n", str ); - for (int i=0; i> exp; - QCOMPARE( exp, l[i] ); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_QString( QTextStream *s ) -{ - QFETCH( QString, str ); - *s << str; -} - -// **************** QByteArray **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QByteArray_data() -{ - QTest::addColumn("modes"); - QTest::addColumn("device"); - QTest::addColumn("encoding"); - QTest::addColumn("cs"); - QTest::addColumn("multi_str"); - QTest::addColumn("zero_length"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << QByteArray("") << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << QByteArray(0) << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << QByteArray("foo") << bool(FALSE) << bool(FALSE); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << QByteArray("foo\nbar") << bool(TRUE) << bool(FALSE); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << QByteArray("cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv") << bool(TRUE) << bool(FALSE); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QByteArray() -{ - QFETCH( bool, zero_length ); - file_is_empty = zero_length; - - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_QByteArray( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_QByteArray( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_QByteArray( QTextStream *s ) -{ -/* - QFETCH( QByteArray, cs ); - QByteArray exp; - *s >> exp; - QCOMPARE( exp, cs ); -*/ - QByteArray exp; - QFETCH( QByteArray, cs ); - if (cs.isNull()) - cs = ""; - - QFETCH( bool, multi_str ); - if (!multi_str) { - *s >> exp; - QCOMPARE( exp.constData(), cs.constData() ); - } else { - QStringList l; - l = QStringList::split( " ", cs ); - if (l.count() < 2) - l = QStringList::split( "\n", cs ); - for (int i=0; i> exp; - QCOMPARE( exp, QByteArray(l[i].toAscii()) ); - } - } -} - -// ------------------------------------------------------------------------------ -static void qt3_generateLineData( bool for_QString ) -{ - QTest::addColumn("input"); - QTest::addColumn("output"); - - QTest::newRow("emptyer") << QByteArray() << QStringList(); - QTest::newRow("lf") << QByteArray("\n") << (QStringList() << ""); - QTest::newRow("crlf") << QByteArray("\r\n") << (QStringList() << ""); - QTest::newRow("oneline/nothing") << QByteArray("ole") << (QStringList() << "ole"); - QTest::newRow("oneline/lf") << QByteArray("ole\n") << (QStringList() << "ole"); - QTest::newRow("oneline/crlf") << QByteArray("ole\r\n") << (QStringList() << "ole"); - QTest::newRow("twolines/lf/lf") << QByteArray("ole\ndole\n") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/crlf/crlf") << QByteArray("ole\r\ndole\r\n") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/lf/crlf") << QByteArray("ole\ndole\r\n") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/lf/nothing") << QByteArray("ole\ndole") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/crlf/nothing") << QByteArray("ole\r\ndole") << (QStringList() << "ole" << "dole"); - QTest::newRow("threelines/lf/lf/lf") << QByteArray("ole\ndole\ndoffen\n") << (QStringList() << "ole" << "dole" << "doffen"); - QTest::newRow("threelines/crlf/crlf/crlf") << QByteArray("ole\r\ndole\r\ndoffen\r\n") << (QStringList() << "ole" << "dole" << "doffen"); - QTest::newRow("threelines/crlf/crlf/nothing") << QByteArray("ole\r\ndole\r\ndoffen") << (QStringList() << "ole" << "dole" << "doffen"); - - if (!for_QString) { - QTest::newRow("unicode/nothing") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65", 8) << (QStringList() << "\345ge"); - QTest::newRow("unicode-little/nothing") << QByteArray("\xff\xfe\xe5\x00\x67\x00\x65\x00", 8) << (QStringList() << "\345ge"); - QTest::newRow("unicode/lf") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0a", 10) << (QStringList() << "\345ge"); - QTest::newRow("unicode-little/lf") << QByteArray("\xff\xfe\xe5\x00\x67\x00\x65\x00\x0a\x00", 10) << (QStringList() << "\345ge"); - - QTest::newRow("unicode/twolines") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0a\x00\xe5\x00\x67\x00\x65\x00\x0a", 18) << (QStringList() << "\345ge" << "\345ge"); - QTest::newRow("unicode-little/twolines") << QByteArray("\xff\xfe\xe5\x00\x67\x00\x65\x00\x0a\x00\xe5\x00\x67\x00\x65\x00\x0a\x00", 18) << (QStringList() << "\345ge" << "\345ge"); - - QTest::newRow("unicode/threelines") - << QByteArray("\xfe\xff" - "\x00\xe5\x00\x67\x00\x65\x00\x0a" - "\x00\xe5\x00\x67\x00\x65\x00\x0a" - "\x00\xe5\x00\x67\x00\x65\x00\x0a", 26) - << (QStringList() << "\345ge" << "\345ge" << "\345ge"); - QTest::newRow("unicode-little/threelines") - << QByteArray("\xff\xfe" - "\xe5\x00\x67\x00\x65\x00\x0a\x00" - "\xe5\x00\x67\x00\x65\x00\x0a\x00" - "\xe5\x00\x67\x00\x65\x00\x0a\x00", 26) - << (QStringList() << "\345ge" << "\345ge" << "\345ge"); - } - - // partials - QTest::newRow("cr") << QByteArray("\r") << (QStringList() << ""); - QTest::newRow("oneline/cr") << QByteArray("ole\r") << (QStringList() << "ole"); - if (!for_QString) - QTest::newRow("unicode/cr") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0d", 10) << (QStringList() << "\345ge"); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToFileReadAsLines_data() -{ - qt3_generateLineData(false); -} - -// ------------------------------------------------------------------------------ -QByteArray pretty(const QString &input) -{ - QByteArray data; - - QByteArray arr = input.toLatin1(); - for (int i = 0; i < arr.size(); ++i) { - char buf[64]; - memset(buf, 0, sizeof(buf)); - char ch = arr.at(i); - sprintf(buf, "\\%2hhx", ch); - data += buf; - } - - return data; -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToFileReadAsLines() -{ - QFETCH(QByteArray, input); - QFETCH(QStringList, output); - - QFile::remove("eoltest"); - - // Create the file - QFile writer("eoltest"); - QVERIFY2(writer.open(QFile::WriteOnly | QFile::Truncate), ("When creating a file: " + writer.errorString()).latin1()); - QCOMPARE(writer.write(input), qlonglong(input.size())); - writer.close(); - - // Read from it using QTextStream - QVERIFY2(writer.open(QFile::ReadOnly), ("When reading a file: " + writer.errorString()).latin1()); - QTextStream stream(&writer); - QStringList tmp; - - while (!stream.atEnd()) - tmp << stream.readLine(); - - QCOMPARE(tmp, output); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToQStringReadAsLines_data() -{ - qt3_generateLineData(true); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToQStringReadAsLines() -{ - QFETCH(QByteArray, input); - QFETCH(QStringList, output); - - QString s = input; - QTextStream stream(&s, QIODevice::ReadOnly); - - QStringList tmp; - while (!stream.atEnd()) - tmp << stream.readLine(); - - QCOMPARE(tmp, output); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_QByteArray( QTextStream *s ) -{ - QFETCH( QByteArray, cs ); - *s << cs; -} -#endif - // ------------------------------------------------------------------------------ void tst_QTextStream::status_real_read_data() { diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp index 6ad0678745..054a9957be 100644 --- a/tests/auto/qthread/tst_qthread.cpp +++ b/tests/auto/qthread/tst_qthread.cpp @@ -209,7 +209,7 @@ public: cond.wait(&mutex, five_minutes); } setTerminationEnabled(true); - Q_ASSERT_X(false, "tst_QThread", "test case hung"); + qFatal("tst_QThread: test case hung"); } }; diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp index 2391c81b63..d3eea0cae2 100644 --- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp @@ -320,7 +320,7 @@ public: static QBasicAtomicInt count; inline SPointer() { count.ref(); } inline ~SPointer() { count.deref(); } - inline SPointer(const SPointer &other) { count.ref(); } + inline SPointer(const SPointer & /* other */) { count.ref(); } }; QBasicAtomicInt SPointer::count = Q_BASIC_ATOMIC_INITIALIZER(0); diff --git a/tests/auto/qtipc/lackey/lackey.pro b/tests/auto/qtipc/lackey/lackey.pro index 39123125f3..2fa364c4c9 100644 --- a/tests/auto/qtipc/lackey/lackey.pro +++ b/tests/auto/qtipc/lackey/lackey.pro @@ -1,6 +1,7 @@ include(../qsharedmemory/src/src.pri) QT = core script +QT += core-private CONFIG += qtestlib diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro index e232443a35..e3d99bb85c 100644 --- a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro +++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro @@ -1,5 +1,5 @@ CONFIG += qttest_p4 -#QT = core +QT += gui-private include(../src/src.pri) win32: CONFIG += console diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp index 6db84dd982..647d857407 100644 --- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp +++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp @@ -207,7 +207,8 @@ bool QSystemLockPrivate::modifySemaphore(QSystemLockPrivate::Operation op, if ((lockCount == 0 && op == Lock) || (lockCount > 0 && op == Unlock)) { if (op == Unlock) { --lockCount; - Q_ASSERT(lockCount >= 0); + if (lockCount < 0) + qFatal("%s: lockCount must not be negative", Q_FUNC_INFO); if (lockCount > 0) return true; } diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp index f6803f7d01..f7e4ab22c4 100644 --- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp +++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp @@ -157,7 +157,8 @@ bool QSystemLockPrivate::modifySemaphore(QSystemLockPrivate::Operation op, if ((lockCount == 0 && op == Lock) || (lockCount > 0 && op == Unlock)) { if (op == Unlock) { --lockCount; - Q_ASSERT(lockCount >= 0); + if (lockCount < 0) + qFatal("%s: lockCount must not be negative", Q_FUNC_INFO); if (lockCount > 0) return true; } diff --git a/tests/auto/qtipc/qsharedmemory/src/src.pri b/tests/auto/qtipc/qsharedmemory/src/src.pri index 5bc9de62db..8aaf528447 100644 --- a/tests/auto/qtipc/qsharedmemory/src/src.pri +++ b/tests/auto/qtipc/qsharedmemory/src/src.pri @@ -1,5 +1,6 @@ INCLUDEPATH += $$PWD DEPENDPATH += $$PWD +QT += core-private SOURCES += $$PWD/qsystemlock.cpp diff --git a/tests/auto/qtoolbar/qtoolbar.pro b/tests/auto/qtoolbar/qtoolbar.pro index 4f2c8f1e1f..2c1176fe00 100644 --- a/tests/auto/qtoolbar/qtoolbar.pro +++ b/tests/auto/qtoolbar/qtoolbar.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += gui-private SOURCES += tst_qtoolbar.cpp diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp index 8495a04ab1..9da319faa2 100644 --- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp @@ -119,13 +119,6 @@ void tst_QToolButton::getSetCheck() obj1.setDefaultAction((QAction *)0); QCOMPARE((QAction *)0, obj1.defaultAction()); delete var4; - -#ifdef QT_HAS_QT3SUPPORT - //ensure that popup delay is not reset on style change - obj1.setPopupDelay(5); - obj1.setStyle(new QWindowsStyle); - QCOMPARE(obj1.popupDelay(), 5); -#endif } Q_DECLARE_METATYPE(QAction*) diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index c07c471eb4..f03e07ab38 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -277,7 +277,8 @@ public: } int rowCount(const QModelIndex& parent = QModelIndex()) const { - Q_ASSERT(fetched); + if (!fetched) + qFatal("%s: rowCount should not be called before fetching", Q_FUNC_INFO); if ((parent.column() > 0) || (level(parent) > levels)) return 0; return rows; @@ -2536,7 +2537,7 @@ void tst_QTreeView::sortByColumn() /* This is a model that every time kill() is called it will completely change - all of its nodes for new nodes. It then asserts if you later use a dead node. + all of its nodes for new nodes. It then qFatal's if you later use a dead node. */ class EvilModel: public QAbstractItemModel { @@ -2567,7 +2568,8 @@ public: } } if (parent == 0) { - Q_ASSERT(children.isEmpty()); + if (!children.isEmpty()) + qFatal("%s: children should be empty when parent is null", Q_FUNC_INFO); populate(); } else { isDead = true; @@ -2624,7 +2626,8 @@ public: Node *parentNode = root; if (parent.isValid()) { parentNode = static_cast(parent.internalPointer()); - Q_ASSERT(!parentNode->isDead); + if (parentNode->isDead) + qFatal("%s: parentNode is dead!", Q_FUNC_INFO); } return parentNode->children.count(); } @@ -2639,9 +2642,11 @@ public: Node *grandparentNode = static_cast(parent.internalPointer()); Node *parentNode = root; if (parent.isValid()) { - Q_ASSERT(!grandparentNode->isDead); + if (grandparentNode->isDead) + qFatal("%s: grandparentNode is dead!", Q_FUNC_INFO); parentNode = grandparentNode->children[parent.row()]; - Q_ASSERT(!parentNode->isDead); + if (parentNode->isDead) + qFatal("%s: grandparentNode is dead!", Q_FUNC_INFO); } return createIndex(row, column, parentNode); } @@ -2661,7 +2666,8 @@ public: Node *parentNode = root; if (idx.isValid()) { parentNode = static_cast(idx.internalPointer()); - Q_ASSERT(!parentNode->isDead); + if (parentNode->isDead) + qFatal("%s: grandparentNode is dead!", Q_FUNC_INFO); } return QString("[%1,%2,%3]").arg(idx.row()).arg(idx.column()) .arg(parentNode->isDead ? "dead" : "alive"); @@ -3794,7 +3800,7 @@ class Model_11466 : public QAbstractItemModel { Q_OBJECT public: - Model_11466(QObject *parent) : + Model_11466(QObject * /* parent */) : m_block(false) { // set up the model to have two top level items and a few others @@ -3811,7 +3817,7 @@ public: return 2; // two top level items } - int columnCount(const QModelIndex &parent) const + int columnCount(const QModelIndex & /* parent */) const { return 2; } diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 336ee36584..053e3b35bb 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -198,10 +198,6 @@ private slots: void task_240612(); void taskQTBUG_6962(); void taskQTBUG_8701(); - -#ifdef QT3_SUPPORT - void dirPath(); -#endif }; // Testing get/set functions @@ -3933,13 +3929,6 @@ void tst_QUrl::task_240612() QCOMPARE(url.toEncoded().constData(), "//example.com/test.txt"); } -#ifdef QT3_SUPPORT -void tst_QUrl::dirPath() -{ - QCOMPARE(QUrl("http://www.vg.no/test/file.txt").dirPath(), QString("/test")); -} -#endif - void tst_QUrl::resolvedWithAbsoluteSchemes() const { QFETCH(QUrl, base); diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 9422abc5dd..9efb6c6eb3 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -50,9 +50,6 @@ #include #include #include -#ifdef QT3_SUPPORT -# include -#endif #include #include #include @@ -141,18 +138,12 @@ private slots: void toULongLong_data(); void toULongLong(); - void asType_data(); - void asType(); - void toByteArray_data(); void toByteArray(); void toString_data(); void toString(); - void toCString_data(); - void toCString(); - void toDate_data(); void toDate(); @@ -231,8 +222,6 @@ private slots: void podUserType(); - void nullAsType(); - void data_(); // data is virtual function in QtTestCase void constData(); @@ -243,7 +232,6 @@ private slots: void variantMap(); void variantHash(); - void invalidAsByteArray(); void convertToQUint8() const; void invalidQColor() const; void comparePointers() const; @@ -283,9 +271,6 @@ Q_DECLARE_METATYPE(QDate) Q_DECLARE_METATYPE(QTime) Q_DECLARE_METATYPE(QDateTime) Q_DECLARE_METATYPE(QVariant) -#ifdef QT3_SUPPORT -Q_DECLARE_METATYPE(Q3CString) -#endif const qlonglong intMax1 = (qlonglong)INT_MAX + 1; const qulonglong uintMax1 = (qulonglong)UINT_MAX + 1; @@ -369,9 +354,6 @@ void tst_QVariant::isNull() QVariant varLL( (qlonglong)0 ); QVERIFY( !varLL.isNull() ); QVariant var7(QString::null); -#ifdef QT3_SUPPORT - QCOMPARE(var7.asInt(), 0); -#endif QVERIFY(var7.isNull()); } @@ -393,15 +375,12 @@ void tst_QVariant::canConvert_data() QTest::addColumn("BoolCast"); QTest::addColumn("BrushCast"); QTest::addColumn("ByteArrayCast"); - QTest::addColumn("CStringCast"); QTest::addColumn("ColorCast"); - QTest::addColumn("ColorGroupCast"); QTest::addColumn("CursorCast"); QTest::addColumn("DateCast"); QTest::addColumn("DateTimeCast"); QTest::addColumn("DoubleCast"); QTest::addColumn("FontCast"); - QTest::addColumn("IconSetCast"); QTest::addColumn("ImageCast"); QTest::addColumn("IntCast"); QTest::addColumn("InvalidCast"); @@ -412,7 +391,6 @@ void tst_QVariant::canConvert_data() QTest::addColumn("PaletteCast"); QTest::addColumn("PenCast"); QTest::addColumn("PixmapCast"); - QTest::addColumn("PointArrayCast"); QTest::addColumn("PointCast"); QTest::addColumn("RectCast"); QTest::addColumn("RegionCast"); @@ -433,125 +411,110 @@ void tst_QVariant::canConvert_data() #endif #define Y true #define N false - // bita bitm bool brsh byta cstr col colg curs date dt dbl font icon img int inv kseq list ll map pal pen pix pnta pnt rect reg size sp str strl time uint ull + // bita bitm bool brsh byta col curs date dt dbl font img int inv kseq list ll map pal pen pix pnt rect reg size sp str strl time uint ull QVariant var(QBitArray(0)); QTest::newRow("BitArray") - << var << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QBitmap()); QTest::newRow("Bitmap") - << var << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; -#ifdef QT3_SUPPORT - var = QVariant(true, 0); - QTest::newRow("Bool") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; -#endif + << var << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QBrush()); QTest::newRow("Brush") - << var << N << N << N << Y << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = QVariant(QByteArray()); QTest::newRow("ByteArray") - << var << N << N << Y << N << Y << Y << Y << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; -#ifdef QT3_SUPPORT - var = QVariant(Q3CString("cstring")); - QTest::newRow("CString") - << var << N << N << Y << N << Y << Y << Y << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; -#endif + << var << N << N << Y << N << Y << Y << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = qVariantFromValue(QColor()); QTest::newRow("Color") - << var << N << N << N << Y << Y << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; -#ifdef QT3_SUPPORT - var = qVariantFromValue(QColorGroup()); - QTest::newRow("ColorGroup") - << var << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; -#endif + << var << N << N << N << Y << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; #ifndef QT_NO_CURSOR var = qVariantFromValue(QCursor()); QTest::newRow("Cursor") - << var << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; #endif var = QVariant(QDate()); QTest::newRow("Date") - << var << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; + << var << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; var = QVariant(QDateTime()); QTest::newRow("DateTime") - << var << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; + << var << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; var = QVariant((double)0.1); QTest::newRow("Double") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant(0.1f); QTest::newRow("Float") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = qVariantFromValue(QFont()); QTest::newRow("Font") - << var << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; var = qVariantFromValue(QIcon()); QTest::newRow("Icon") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QImage()); QTest::newRow("Image") - << var << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; + << var << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = QVariant((int)1); QTest::newRow("Int") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant(); QTest::newRow("Invalid") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QKeySequence()); QTest::newRow("KeySequence") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; var = QVariant(QList()); QTest::newRow("List") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N; var = QVariant((qlonglong)1); QTest::newRow("LongLong") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant(QMap()); QTest::newRow("Map") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPalette()); QTest::newRow("Palette") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPen()); QTest::newRow("Pen") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPixmap()); QTest::newRow("Pixmap") - << var << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; + << var << N << Y << N << Y << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPolygon()); QTest::newRow("PointArray") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = QVariant(QPoint()); QTest::newRow("Point") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N; var = QVariant(QRect()); QTest::newRow("Rect") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N; var = qVariantFromValue(QRegion()); QTest::newRow("Region") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N; var = QVariant(QSize()); QTest::newRow("Size") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N; var = qVariantFromValue(QSizePolicy()); QTest::newRow("SizePolicy") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N; var = QVariant(QString()); QTest::newRow("String") - << var << N << N << Y << N << Y << Y << Y << N << N << Y << Y << Y << Y << N << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << Y << Y << Y << Y << Y; + << var << N << N << Y << N << Y << Y << N << Y << Y << Y << Y << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << Y << Y << Y << Y << Y; var = QVariant(QStringList("entry")); QTest::newRow("StringList") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N; var = QVariant(QTime()); QTest::newRow("Time") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; var = QVariant((uint)1); QTest::newRow("UInt") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant((qulonglong)1); QTest::newRow("ULongLong") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; #undef N #undef Y @@ -565,15 +528,12 @@ void tst_QVariant::canConvert() QFETCH(bool, BoolCast); QFETCH(bool, BrushCast); QFETCH(bool, ByteArrayCast); - QFETCH(bool, CStringCast); QFETCH(bool, ColorCast); - QFETCH(bool, ColorGroupCast); QFETCH(bool, CursorCast); QFETCH(bool, DateCast); QFETCH(bool, DateTimeCast); QFETCH(bool, DoubleCast); QFETCH(bool, FontCast); - QFETCH(bool, IconSetCast); QFETCH(bool, ImageCast); QFETCH(bool, IntCast); QFETCH(bool, InvalidCast); @@ -584,7 +544,6 @@ void tst_QVariant::canConvert() QFETCH(bool, PaletteCast); QFETCH(bool, PenCast); QFETCH(bool, PixmapCast); - QFETCH(bool, PointArrayCast); QFETCH(bool, PointCast); QFETCH(bool, RectCast); QFETCH(bool, RegionCast); @@ -601,28 +560,13 @@ void tst_QVariant::canConvert() QCOMPARE(val.canConvert(QVariant::Bool), BoolCast); QCOMPARE(val.canConvert(QVariant::Brush), BrushCast); QCOMPARE(val.canConvert(QVariant::ByteArray), ByteArrayCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::CString), CStringCast); -#else - Q_UNUSED(CStringCast); -#endif QCOMPARE(val.canConvert(QVariant::Color), ColorCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::ColorGroup), ColorGroupCast); -#else - Q_UNUSED(ColorGroupCast); -#endif QCOMPARE(val.canConvert(QVariant::Cursor), CursorCast); QCOMPARE(val.canConvert(QVariant::Date), DateCast); QCOMPARE(val.canConvert(QVariant::DateTime), DateTimeCast); QCOMPARE(val.canConvert(QVariant::Double), DoubleCast); QCOMPARE(val.canConvert(QVariant::Type(QMetaType::Float)), DoubleCast); QCOMPARE(val.canConvert(QVariant::Font), FontCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::IconSet), IconSetCast); -#else - Q_UNUSED(IconSetCast); -#endif QCOMPARE(val.canConvert(QVariant::Image), ImageCast); QCOMPARE(val.canConvert(QVariant::Int), IntCast); QCOMPARE(val.canConvert(QVariant::Invalid), InvalidCast); @@ -633,11 +577,6 @@ void tst_QVariant::canConvert() QCOMPARE(val.canConvert(QVariant::Palette), PaletteCast); QCOMPARE(val.canConvert(QVariant::Pen), PenCast); QCOMPARE(val.canConvert(QVariant::Pixmap), PixmapCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::PointArray), PointArrayCast); -#else - Q_UNUSED(PointArrayCast); -#endif QCOMPARE(val.canConvert(QVariant::Point), PointCast); QCOMPARE(val.canConvert(QVariant::Rect), RectCast); QCOMPARE(val.canConvert(QVariant::Region), RegionCast); @@ -661,9 +600,6 @@ void tst_QVariant::toInt_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << 3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << 3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << 123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << 1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << 123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode String") ) << 0 << false; QTest::newRow( "longlong0" ) << QVariant( (qlonglong)34 ) << 34 << true; @@ -714,9 +650,6 @@ void tst_QVariant::toUInt_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (uint)3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (uint)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (uint)123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << (uint)1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << (uint)123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode String") ) << (uint)0 << false; QTest::newRow( "string2" ) << QVariant( QString("4") ) << (uint)4 << true; @@ -911,10 +844,6 @@ void tst_QVariant::toBool_data() QTest::newRow( "float0" ) << QVariant( 0.0f ) << false; QTest::newRow( "double1" ) << QVariant( 3.1415927 ) << true; QTest::newRow( "float1" ) << QVariant( 3.1415927f ) << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool0" ) << QVariant( false, 42 ) << false; - QTest::newRow( "bool1" ) << QVariant( true, 42 ) << true; -#endif QTest::newRow( "string0" ) << QVariant( QString("3") ) << true; QTest::newRow( "string1" ) << QVariant( QString("true") ) << true; QTest::newRow( "string2" ) << QVariant( QString("0") ) << false; @@ -1142,9 +1071,6 @@ void tst_QVariant::toLongLong_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (qlonglong)3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (qlonglong)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (qlonglong)123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << (qlonglong)1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << (qlonglong)123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode fun") ) << (qlonglong)0 @@ -1183,9 +1109,6 @@ void tst_QVariant::toULongLong_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (qulonglong)3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (qulonglong)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (qulonglong)123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << (qulonglong)1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << (qulonglong)123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode fun") ) << (qulonglong)0 @@ -1220,38 +1143,6 @@ void tst_QVariant::toULongLong() QVERIFY( ok == valueOK ); } -void tst_QVariant::asType_data() -{ - QTest::addColumn("value"); - - QTest::newRow( "string" ) << QVariant( QString( "1.0" ) ); -} - -void tst_QVariant::asType() -{ -#ifndef QT3_SUPPORT - QSKIP("Qt compiled without Qt3Support", SkipAll); -#else - QFETCH( QVariant, value ); - QVariant::Type type = value.type(); - - QVariant copy = value; - copy.asDouble(); - QCOMPARE( value.type(), type ); - - copy = value; - copy.asList(); - QCOMPARE( value.type(), type ); - - copy = value; - copy.asMap(); - QCOMPARE( value.type(), type ); - - copy = value; - QCOMPARE( value.type(), type ); -#endif -} - void tst_QVariant::toByteArray_data() { QTest::addColumn("value"); @@ -1297,11 +1188,7 @@ void tst_QVariant::toString_data() QTest::newRow( "uint" ) << QVariant( (uint)123 ) << QString( "123" ); QTest::newRow( "double" ) << QVariant( 123.456 ) << QString( "123.456" ); QTest::newRow( "float" ) << QVariant( 123.456f ) << QString( "123.456" ); -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 0 ) << QString( "true" ); -#else QTest::newRow( "bool" ) << QVariant( true ) << QString( "true" ); -#endif QTest::newRow( "qdate" ) << QVariant( QDate( 2002, 1, 1 ) ) << QString( "2002-01-01" ); QTest::newRow( "qtime" ) << QVariant( QTime( 12, 34, 56 ) ) << QString( "12:34:56" ); QTest::newRow( "qdatetime" ) << QVariant( QDateTime( QDate( 2002, 1, 1 ), QTime( 12, 34, 56 ) ) ) << QString( "2002-01-01T12:34:56" ); @@ -1329,32 +1216,6 @@ void tst_QVariant::toString() QCOMPARE( str, result ); } -void tst_QVariant::toCString_data() -{ -#ifdef QT3_SUPPORT - QTest::addColumn("value"); - QTest::addColumn("result"); - - QTest::newRow( "qstring" ) << QVariant( Q3CString( "Test" ) ) << Q3CString( "Test" ); - QTest::newRow( "qcstring") << QVariant( Q3CString( "Test\0" ) ) << Q3CString( "Test" ); -#endif -} - -void tst_QVariant::toCString() -{ -#ifdef QT3_SUPPORT - QFETCH( QVariant, value ); - QFETCH( Q3CString, result ); - QVERIFY( value.isValid() ); - - Q3CString str = value.toCString(); - - QCOMPARE( str, result ); -#else - QSKIP("Qt not build with Qt3Support", SkipAll); -#endif -} - void tst_QVariant::toDate_data() { QTest::addColumn("value"); @@ -1558,14 +1419,8 @@ void tst_QVariant::writeToReadFromDataStream_data() QTest::newRow( "bitmap_valid" ) << qVariantFromValue( bitmap ) << false; QTest::newRow( "brush_valid" ) << qVariantFromValue( QBrush( Qt::red ) ) << false; QTest::newRow( "color_valid" ) << qVariantFromValue( QColor( Qt::red ) ) << false; -#ifdef QT3_SUPPORT - QTest::newRow( "colorgroup_valid" ) << qVariantFromValue(QPalette(QColor("turquoise")).active()) << false; -#endif #ifndef QT_NO_CURSOR QTest::newRow( "cursor_valid" ) << qVariantFromValue( QCursor( Qt::PointingHandCursor ) ) << false; -#endif -#ifdef QT3_SUPPORT - QTest::newRow( "bool_valid" ) << QVariant( true, 0 ) << false; #endif QTest::newRow( "date_invalid" ) << QVariant( QDate() ) << true; QTest::newRow( "date_valid" ) << QVariant( QDate( 2002, 07, 06 ) ) << false; @@ -1578,16 +1433,8 @@ void tst_QVariant::writeToReadFromDataStream_data() QPixmap pixmap( 10, 10 ); pixmap.fill( Qt::red ); QTest::newRow( "pixmap_valid" ) << qVariantFromValue( pixmap ) << false; -#ifdef QT3_SUPPORT - QTest::newRow( "iconset_invalid" ) << qVariantFromValue( QIcon() ) << true; -#endif // QTest::newRow( "iconset_valid" ) << QVariant( QIcon( pixmap ) ) << false; QTest::newRow( "image_invalid" ) << qVariantFromValue( QImage() ) << true; -#ifdef QT3_SUPPORT - QImage image( 10, 10, 32 ); - image.fill( QColor( Qt::red ).pixel() ); - QTest::newRow( "image_valid" ) << qVariantFromValue( image ) << false; -#endif QTest::newRow( "keysequence_valid" ) << qVariantFromValue( QKeySequence( Qt::CTRL + Qt::Key_A ) ) << false; QTest::newRow( "int_valid" ) << QVariant( -123 ) << false; typedef QList variantsList; @@ -1616,10 +1463,6 @@ void tst_QVariant::writeToReadFromDataStream_data() QTest::newRow( "size_valid" ) << QVariant( QSize( 10, 10 ) ) << false; QTest::newRow( "string_invalid" ) << QVariant( QString() ) << true; QTest::newRow( "string_valid" ) << QVariant( QString( "Test" ) ) << false; -#ifdef QT3_SUPPORT - QTest::newRow( "cstring_invalid" ) << QVariant( Q3CString() ) << true; - QTest::newRow( "cstring_valid" ) << QVariant( Q3CString( "Test" ) ) << false; -#endif QStringList stringlist; stringlist << "One" << "Two" << "Three"; QTest::newRow( "stringlist_valid" ) << QVariant( stringlist ) << false; @@ -1674,13 +1517,8 @@ void tst_QVariant::writeToReadFromDataStream() // Since only a few won't match since the serial numbers are different // I won't bother adding another bool in the data test. QVariant::Type writeType = writeVariant.type(); -#ifdef QT3_SUPPORT - if ( writeType != QVariant::Invalid && writeType != QVariant::Bitmap && writeType != QVariant::Pixmap - && writeType != QVariant::Image && writeType != QVariant::IconSet ) { -#else if ( writeType != QVariant::Invalid && writeType != QVariant::Bitmap && writeType != QVariant::Pixmap && writeType != QVariant::Image) { -#endif switch (writeType) { default: QCOMPARE( readVariant, writeVariant ); @@ -1805,11 +1643,7 @@ void tst_QVariant::operator_eq_eq_data() QVariant mULongLongString(QByteArray("42")); QVariant mULongLongQString(QString("42")); -#ifdef QT3_SUPPORT - QVariant mBool(false, 0); -#else QVariant mBool(false); -#endif QVariant mBoolString(QByteArray("false")); QVariant mBoolQString(QString("false")); @@ -2028,45 +1862,45 @@ void tst_QVariant::typeName_data() QTest::newRow("9") << int(QVariant::Size) << QByteArray("QSize"); QTest::newRow("10") << int(QVariant::Color) << QByteArray("QColor"); QTest::newRow("11") << int(QVariant::Palette) << QByteArray("QPalette"); - QTest::newRow("14") << int(QVariant::Point) << QByteArray("QPoint"); - QTest::newRow("15") << int(QVariant::Image) << QByteArray("QImage"); - QTest::newRow("16") << int(QVariant::Int) << QByteArray("int"); - QTest::newRow("17") << int(QVariant::UInt) << QByteArray("uint"); - QTest::newRow("18") << int(QVariant::Bool) << QByteArray("bool"); - QTest::newRow("19") << int(QVariant::Double) << QByteArray("double"); - QTest::newRow("20") << int(QMetaType::Float) << QByteArray("float"); - QTest::newRow("21") << int(QVariant::Polygon) << QByteArray("QPolygon"); - QTest::newRow("22") << int(QVariant::Region) << QByteArray("QRegion"); - QTest::newRow("23") << int(QVariant::Bitmap) << QByteArray("QBitmap"); - QTest::newRow("24") << int(QVariant::Cursor) << QByteArray("QCursor"); - QTest::newRow("25") << int(QVariant::SizePolicy) << QByteArray("QSizePolicy"); - QTest::newRow("26") << int(QVariant::Date) << QByteArray("QDate"); - QTest::newRow("27") << int(QVariant::Time) << QByteArray("QTime"); - QTest::newRow("28") << int(QVariant::DateTime) << QByteArray("QDateTime"); - QTest::newRow("29") << int(QVariant::ByteArray) << QByteArray("QByteArray"); - QTest::newRow("30") << int(QVariant::BitArray) << QByteArray("QBitArray"); - QTest::newRow("31") << int(QVariant::KeySequence) << QByteArray("QKeySequence"); - QTest::newRow("32") << int(QVariant::Pen) << QByteArray("QPen"); - QTest::newRow("33") << int(QVariant::LongLong) << QByteArray("qlonglong"); - QTest::newRow("34") << int(QVariant::ULongLong) << QByteArray("qulonglong"); - QTest::newRow("35") << int(QVariant::Char) << QByteArray("QChar"); - QTest::newRow("36") << int(QVariant::Url) << QByteArray("QUrl"); - QTest::newRow("37") << int(QVariant::TextLength) << QByteArray("QTextLength"); - QTest::newRow("38") << int(QVariant::TextFormat) << QByteArray("QTextFormat"); - QTest::newRow("39") << int(QVariant::Locale) << QByteArray("QLocale"); - QTest::newRow("40") << int(QVariant::LineF) << QByteArray("QLineF"); - QTest::newRow("41") << int(QVariant::RectF) << QByteArray("QRectF"); - QTest::newRow("42") << int(QVariant::PointF) << QByteArray("QPointF"); - QTest::newRow("43") << int(QVariant::RegExp) << QByteArray("QRegExp"); - QTest::newRow("44") << int(QVariant::UserType) << QByteArray("UserType"); - QTest::newRow("45") << int(QVariant::Matrix) << QByteArray("QMatrix"); - QTest::newRow("46") << int(QVariant::Transform) << QByteArray("QTransform"); - QTest::newRow("47") << int(QVariant::Hash) << QByteArray("QVariantHash"); - QTest::newRow("48") << int(QVariant::Matrix4x4) << QByteArray("QMatrix4x4"); - QTest::newRow("49") << int(QVariant::Vector2D) << QByteArray("QVector2D"); - QTest::newRow("50") << int(QVariant::Vector3D) << QByteArray("QVector3D"); - QTest::newRow("51") << int(QVariant::Vector4D) << QByteArray("QVector4D"); - QTest::newRow("52") << int(QVariant::Quaternion) << QByteArray("QQuaternion"); + QTest::newRow("12") << int(QVariant::Point) << QByteArray("QPoint"); + QTest::newRow("13") << int(QVariant::Image) << QByteArray("QImage"); + QTest::newRow("14") << int(QVariant::Int) << QByteArray("int"); + QTest::newRow("15") << int(QVariant::UInt) << QByteArray("uint"); + QTest::newRow("16") << int(QVariant::Bool) << QByteArray("bool"); + QTest::newRow("17") << int(QVariant::Double) << QByteArray("double"); + QTest::newRow("18") << int(QMetaType::Float) << QByteArray("float"); + QTest::newRow("19") << int(QVariant::Polygon) << QByteArray("QPolygon"); + QTest::newRow("20") << int(QVariant::Region) << QByteArray("QRegion"); + QTest::newRow("21") << int(QVariant::Bitmap) << QByteArray("QBitmap"); + QTest::newRow("22") << int(QVariant::Cursor) << QByteArray("QCursor"); + QTest::newRow("23") << int(QVariant::SizePolicy) << QByteArray("QSizePolicy"); + QTest::newRow("24") << int(QVariant::Date) << QByteArray("QDate"); + QTest::newRow("25") << int(QVariant::Time) << QByteArray("QTime"); + QTest::newRow("26") << int(QVariant::DateTime) << QByteArray("QDateTime"); + QTest::newRow("27") << int(QVariant::ByteArray) << QByteArray("QByteArray"); + QTest::newRow("28") << int(QVariant::BitArray) << QByteArray("QBitArray"); + QTest::newRow("29") << int(QVariant::KeySequence) << QByteArray("QKeySequence"); + QTest::newRow("30") << int(QVariant::Pen) << QByteArray("QPen"); + QTest::newRow("31") << int(QVariant::LongLong) << QByteArray("qlonglong"); + QTest::newRow("32") << int(QVariant::ULongLong) << QByteArray("qulonglong"); + QTest::newRow("33") << int(QVariant::Char) << QByteArray("QChar"); + QTest::newRow("34") << int(QVariant::Url) << QByteArray("QUrl"); + QTest::newRow("35") << int(QVariant::TextLength) << QByteArray("QTextLength"); + QTest::newRow("36") << int(QVariant::TextFormat) << QByteArray("QTextFormat"); + QTest::newRow("37") << int(QVariant::Locale) << QByteArray("QLocale"); + QTest::newRow("38") << int(QVariant::LineF) << QByteArray("QLineF"); + QTest::newRow("39") << int(QVariant::RectF) << QByteArray("QRectF"); + QTest::newRow("40") << int(QVariant::PointF) << QByteArray("QPointF"); + QTest::newRow("41") << int(QVariant::RegExp) << QByteArray("QRegExp"); + QTest::newRow("42") << int(QVariant::UserType) << QByteArray("UserType"); + QTest::newRow("43") << int(QVariant::Matrix) << QByteArray("QMatrix"); + QTest::newRow("44") << int(QVariant::Transform) << QByteArray("QTransform"); + QTest::newRow("45") << int(QVariant::Hash) << QByteArray("QVariantHash"); + QTest::newRow("46") << int(QVariant::Matrix4x4) << QByteArray("QMatrix4x4"); + QTest::newRow("47") << int(QVariant::Vector2D) << QByteArray("QVector2D"); + QTest::newRow("48") << int(QVariant::Vector3D) << QByteArray("QVector3D"); + QTest::newRow("49") << int(QVariant::Vector4D) << QByteArray("QVector4D"); + QTest::newRow("50") << int(QVariant::Quaternion) << QByteArray("QQuaternion"); } void tst_QVariant::typeName() @@ -2101,9 +1935,6 @@ void tst_QVariant::typeToName() QVERIFY( QVariant::nameToType( "" ) == QVariant::Invalid ); QVERIFY( QVariant::nameToType( "foo" ) == QVariant::Invalid ); QCOMPARE(QVariant::nameToType("QIconSet"), QVariant::Icon); -#ifdef QT3_SUPPORT - QCOMPARE(QVariant::nameToType("Q3CString"), QVariant::ByteArray); -#endif } void tst_QVariant::streamInvalidVariant() @@ -2134,45 +1965,6 @@ void tst_QVariant::streamInvalidVariant() QVERIFY( readY == writeY ); } -void tst_QVariant::nullAsType() -{ -#ifdef QT3_SUPPORT - QVariant null; - QVERIFY(null.isNull()); - - null.asInt(); - QVERIFY(null.isNull()); - - null = QVariant(QString::null); - QVERIFY(null.isNull()); - - null.asInt(); - QVERIFY(null.isNull()); - - int type = QVariant::Invalid; - while (type < (int)QVariant::ULongLong) { - null = QVariant(); - QVERIFY(null.isNull()); - - type++; - if (type == 20) - continue; - if (type == QVariant::Size) - // QSize has its own ideas of ::isNull - continue; - - if (!null.convert((QVariant::Type)type)) - continue; - QCOMPARE((int)null.type(), type); - - QVERIFY2(null.isNull(), qPrintable(QString("'null.isNull()' failed for type: %1").arg(null.typeName()))); - } - - null = QVariant(QLatin1String(static_cast(0))); - QVERIFY(null.isNull()); -#endif -} - static int instanceCount = 0; struct MyType @@ -2629,20 +2421,6 @@ void tst_QVariant::variantHash() QCOMPARE(qvariant_cast(v3).value("test").toInt(), 42); } -void tst_QVariant::invalidAsByteArray() -{ -#ifdef QT3_SUPPORT - QVariant v; - QByteArray &a = v.asByteArray(); - a.resize(2); - a[0] = 'a'; - a[1] = 'b'; - QCOMPARE(v, QVariant(QByteArray("ab"))); -#else - QSKIP("Qt compiled without Qt3Support",SkipAll); -#endif -} - void tst_QVariant::invalidQColor() const { QVariant va("An invalid QColor::name() value."); @@ -3235,18 +3013,24 @@ struct MyData { void *ptr; MyData() : ptr(this) {} - ~MyData() { Q_ASSERT(ptr == this); } - MyData(const MyData& o) : ptr(this) { Q_ASSERT(o.ptr == &o); } + ~MyData() + { + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + } + MyData(const MyData& o) : ptr(this) + { + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); + } MyData &operator=(const MyData &o) { - Q_ASSERT(ptr == this); - Q_ASSERT(o.ptr == &o); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return *this; } bool operator==(const MyData &o) const { - Q_ASSERT(ptr == this); - Q_ASSERT(o.ptr == &o); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return true; } }; diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 23e1d3186a..0b35c49bb0 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -40,10 +40,6 @@ ****************************************************************************/ -#if defined(QT3_SUPPORT) -#include -#include -#endif #include #include #include @@ -169,7 +165,6 @@ public: tst_QWidget(); virtual ~tst_QWidget(); - public slots: void initTestCase(); void cleanupTestCase(); @@ -189,10 +184,8 @@ private slots: void isVisibleTo(); void isHidden(); void fonts(); - void mapToGlobal(); void mapFromAndTo_data(); void mapFromAndTo(); - void checkFocus(); void focusChainOnHide(); void focusChainOnReparent(); void setTabOrder(); @@ -650,9 +643,6 @@ void tst_QWidget::initTestCase() // Create the test class testWidget = new BezierViewer( 0, "testObject"); testWidget->resize(200,200); -#ifdef QT3_SUPPORT - qApp->setMainWidget(testWidget); -#endif testWidget->show(); QTest::qWaitForWindowShown(testWidget); QTest::qWait(50); @@ -1343,27 +1333,6 @@ void tst_QWidget::fonts() QVERIFY( cleanTestWidget->font() == originalFont ); } -void tst_QWidget::mapToGlobal() -{ -#if !defined(QT3_SUPPORT) - QSKIP("No Qt3 Support", SkipAll); -#else - QPoint vis = testWidget->mapToGlobal(QPoint(0,0)); - testWidget->hide(); - QCOMPARE(testWidget->mapToGlobal(QPoint(0,0)), vis); - testWidget->show(); - - // test in a layout and witha move - Q3HBox * qhb = new Q3HBox(testWidget); - QWidget * qw = new QWidget(qhb); - qw->move(6,12); - QPoint wVis = qw->mapToGlobal(QPoint(0,0)); - qw->hide(); - QCOMPARE(qw->mapToGlobal(QPoint(0,0)), wVis); - delete qhb; -#endif // QT3_SUPPORT -} - void tst_QWidget::mapFromAndTo_data() { QTest::addColumn("windowHidden"); @@ -1654,36 +1623,6 @@ void tst_QWidget::focusChainOnHide() testWidget->show(); //don't disturb later tests } -void tst_QWidget::checkFocus() -{ -#if !defined(QT3_SUPPORT) - QSKIP("No Qt3 Support", SkipAll); -#else - // This is a very specific test for a specific bug, the bug was - // that when setEnabled(FALSE) then setEnabled(TRUE) was called on - // the parent of a child widget which had focus while hidden, then - // when the widget was shown, the focus would be in the wrong place. - - Q3HBox widget; - QLineEdit *focusWidget = new QLineEdit( &widget ); - new QLineEdit( &widget ); - new QPushButton( &widget ); - focusWidget->setFocus(); - widget.setEnabled( FALSE ); - widget.setEnabled( TRUE ); - widget.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); -#endif - QTest::qWait( 100 ); - widget.activateWindow(); - // next call is necessary since the window manager may not give the focus to the widget when - // it is shown, which causes the QVERIFY to fail - QApplication::setActiveWindow(&widget); - QVERIFY( qApp->focusWidget() == focusWidget ); -#endif // QT3_SUPPORT -} - class Container : public QWidget { public: @@ -2014,28 +1953,6 @@ void tst_QWidget::showMaximized() widget.showMaximized(); QTRY_VERIFY(widget.size().width() > 20 && widget.size().height() > 20); } - -#ifdef QT3_SUPPORT -#if !defined(Q_WS_QWS) -//embedded respects max/min sizes by design -- maybe wrong design, but that's the way it is now. - { - Q3HBox box; - QWidget widget(&box); - widget.setMinimumSize(500, 500); - box.showMaximized(); - QVERIFY(box.isMaximized()); - } - - { - Q3HBox box; - QWidget widget(&box); - widget.setMaximumSize(500, 500); - - box.showMaximized(); - QVERIFY(box.isMaximized()); - } -#endif -#endif // QT3_SUPPORT } void tst_QWidget::showFullScreen() @@ -2107,28 +2024,6 @@ void tst_QWidget::showFullScreen() widget.showFullScreen(); QVERIFY(widget.isFullScreen()); } - -#ifdef QT3_SUPPORT -#if !defined(Q_WS_QWS) -//embedded respects max/min sizes by design -- maybe wrong design, but that's the way it is now. - { - Q3HBox box; - QWidget widget(&box); - widget.setMinimumSize(500, 500); - box.showFullScreen(); - QVERIFY(box.isFullScreen()); - } - - { - Q3HBox box; - QWidget widget(&box); - widget.setMaximumSize(500, 500); - - box.showFullScreen(); - QVERIFY(box.isFullScreen()); - } -#endif -#endif // QT3_SUPPORT } class ResizeWidget : public QWidget { @@ -6374,11 +6269,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) - << qMakePair(&widget, QEvent::ChildInserted) - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Polish) << qMakePair(&widget, QEvent::ChildPolished) @@ -6414,10 +6304,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() EventRecorder::EventList() << qMakePair(&widget, QEvent::WinIdChange) << qMakePair(&widget, QEvent::Polish) -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInserted) - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::ChildPolished) << qMakePair(&widget, QEvent::ChildPolished) << qMakePair(&widget, QEvent::Move) @@ -6433,9 +6319,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Type(QEvent::User + 1)) << qMakePair(&widget, QEvent::Type(QEvent::User + 2)); @@ -6476,10 +6359,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Polish) << qMakePair(&widget, QEvent::ChildPolished) @@ -6516,9 +6395,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() EventRecorder::EventList() << qMakePair(&widget, QEvent::WinIdChange) << qMakePair(&widget, QEvent::Polish) -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::ChildPolished) << qMakePair(&widget, QEvent::Move) << qMakePair(&widget, QEvent::Resize) @@ -6533,9 +6409,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Type(QEvent::User + 1)) << qMakePair(&widget, QEvent::Type(QEvent::User + 2)); @@ -6996,9 +6869,7 @@ void tst_QWidget::renderWithPainter() void tst_QWidget::render_task188133() { QMainWindow mainWindow; -#if defined(QT3_SUPPORT) - mainWindow.setCentralWidget(new Q3TextEdit); -#endif + // Make sure QWidget::render does not trigger QWidget::repaint/update // and asserts for Qt::WA_WState_Created. QPixmap pixmap = QPixmap::grabWidget(&mainWindow); @@ -7234,8 +7105,7 @@ void tst_QWidget::render_systemClip2() QFETCH(bool, usePaintEvent); QFETCH(QColor, expectedColor); - Q_ASSERT_X(expectedColor != QColor(Qt::red), Q_FUNC_INFO, - "Qt::red is the reference color for the image, pick another color"); + QVERIFY2(expectedColor != QColor(Qt::red), "Qt::red is the reference color for the image, pick another color"); class MyWidget : public QWidget { @@ -10422,7 +10292,7 @@ void tst_QWidget::taskQTBUG_7532_tabOrderWithFocusProxy() w.setFocusProxy(fp); QWidget::setTabOrder(&w, fp); - // No Q_ASSERT, then it's allright. + // In debug mode, no assertion failure means it's alright. } void tst_QWidget::movedAndResizedAttributes() diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/qwizard/tst_qwizard.cpp index 5667d4047a..00b59a923b 100644 --- a/tests/auto/qwizard/tst_qwizard.cpp +++ b/tests/auto/qwizard/tst_qwizard.cpp @@ -854,25 +854,26 @@ struct MyPage2 : public QWizardPage public: MyPage2() : init(0), cleanup(0), validate(0) {} - void initializePage() { ++init; QWizardPage::initializePage(); checkInvariant(); } - void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); checkInvariant(); } + void initializePage() { ++init; QWizardPage::initializePage(); } + void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); } bool validatePage() { ++validate; return QWizardPage::validatePage(); } - void check(int init, int cleanup) - { Q_ASSERT(init == this->init && cleanup == this->cleanup); Q_UNUSED(init); Q_UNUSED(cleanup); } + bool check(int init, int cleanup) + { + return init == this->init + && cleanup == this->cleanup + && (this->init == this->cleanup || this->init - 1 == this->cleanup); + } int init; int cleanup; int validate; - -private: - void checkInvariant() { Q_ASSERT(init == cleanup || init - 1 == cleanup); } }; #define CHECK_PAGE_INIT(i0, c0, i1, c1, i2, c2) \ - page0->check((i0), (c0)); \ - page1->check((i1), (c1)); \ - page2->check((i2), (c2)); + QVERIFY(page0->check((i0), (c0))); \ + QVERIFY(page1->check((i1), (c1))); \ + QVERIFY(page2->check((i2), (c2))); void tst_QWizard::setOption_IndependentPages() { diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/qworkspace/tst_qworkspace.cpp index ca12f3e259..191c150004 100644 --- a/tests/auto/qworkspace/tst_qworkspace.cpp +++ b/tests/auto/qworkspace/tst_qworkspace.cpp @@ -45,10 +45,6 @@ #include #include #include -#if defined(QT3_SUPPORT) -#include -#include -#endif //TESTED_CLASS= //TESTED_FILES= @@ -75,7 +71,6 @@ private slots: void getSetCheck(); void windowActivated_data(); void windowActivated(); - void accelPropagation(); void windowActivatedWithMinimize(); void showWindows(); void changeWindowTitle(); @@ -314,59 +309,6 @@ void tst_QWorkspace::accelActivated() accelPressed = TRUE; } -void tst_QWorkspace::accelPropagation() -{ -#if defined (QT3_SUPPORT) - QSKIP( "Until QTest::keyPress() sends the events via the OS, this will skip", SkipAll); - // See #13987 for details of bug report related to this - - QMainWindow mw(0, Qt::X11BypassWindowManagerHint) ; - mw.menuBar(); - QWorkspace *workspace = new QWorkspace(&mw); - workspace->setObjectName("testWidget"); - mw.setCentralWidget(workspace); - connect( workspace, SIGNAL(windowActivated(QWidget*)), this, SLOT(activeChanged(QWidget*)) ); - mw.show(); - qApp->setActiveWindow(&mw); - - QMainWindow* mainWindow = new QMainWindow( workspace ); - - // The popup menu has to have no parent, this is vital in the - // original case of reproducing the bug - - Q3PopupMenu* popup = new Q3PopupMenu; - popup->insertItem("First"); - mainWindow->menuBar()->insertItem("Menu", popup); - - Q3Accel* accel = new Q3Accel(mainWindow); - accel->connectItem(accel->insertItem(Qt::Key_Escape), this, SLOT(accelActivated()) ); - - mainWindow->show(); - - QTest::keyPress( mainWindow, Qt::Key_Escape ); - QVERIFY( accelPressed ); - accelPressed = FALSE; - - QTest::mousePress( mainWindow->menuBar(), Qt::LeftButton, 0, QPoint( 5, 5 ) ); - - // Check the popup menu did appear to be sure - QVERIFY( qApp->activePopupWidget() == popup ); - - QTest::mouseClick( popup, Qt::LeftButton, 0, QPoint( 5, 25 ) ); - - // Check we did actually cause the popup menu to be closed - QVERIFY( !popup->isVisible() ); - - // Now we check that the accelarator still works - QTest::keyPress( mainWindow, Qt::Key_Escape ); - QVERIFY( accelPressed ); - delete popup; -#else - QSKIP( "No Qt3Support. Skipping.", SkipAll); -#endif - -} - void tst_QWorkspace::showWindows() { QWorkspace *ws = new QWorkspace( 0 ); diff --git a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp index c0029f59bd..a2c84cfa50 100644 --- a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp +++ b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp @@ -181,9 +181,7 @@ private slots: { if(bodyLength == -1) { - Q_ASSERT_X(false, Q_FUNC_INFO, - "No length was specified in the header."); - return; + qFatal("No length was specified in the header."); } QDomDocument domDoc; diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp index 565df30961..0e4930454a 100644 --- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp +++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp @@ -165,7 +165,7 @@ class tst_QXmlSimpleReader : public QObject void roundtripWithNamespaces() const; private: - static QDomDocument fromByteArray(const QString &title, const QByteArray &ba); + static QDomDocument fromByteArray(const QString &title, const QByteArray &ba, bool *ok); XmlServer *server; }; @@ -730,25 +730,27 @@ void tst_QXmlSimpleReader::reportNamespace_data() const << QString("http://example.com/"); } -QDomDocument tst_QXmlSimpleReader::fromByteArray(const QString &title, const QByteArray &ba) +QDomDocument tst_QXmlSimpleReader::fromByteArray(const QString &title, const QByteArray &ba, bool *ok) { QDomDocument doc(title); - const bool ret = doc.setContent(ba, true); - Q_ASSERT(ret); + *ok = doc.setContent(ba, true); return doc; } void tst_QXmlSimpleReader::roundtripWithNamespaces() const { - QEXPECT_FAIL("", "Known problem, see 154573. The fix happens to break uic.", Abort); - const char *const expected = "\n"; + bool ok; { const char *const xml = ""; - const QDomDocument one(fromByteArray("document", xml)); - const QDomDocument two(fromByteArray("document2", one.toByteArray(2))); + const QDomDocument one(fromByteArray("document", xml, &ok)); + QVERIFY(ok); + const QDomDocument two(fromByteArray("document2", one.toByteArray(2), &ok)); + QVERIFY(ok); + + QEXPECT_FAIL("", "Known problem, see 154573. The fix happens to break uic.", Abort); QCOMPARE(expected, one.toByteArray().constData()); QCOMPARE(one.toByteArray(2).constData(), two.toByteArray(2).constData()); @@ -758,8 +760,10 @@ void tst_QXmlSimpleReader::roundtripWithNamespaces() const { const char *const xml = ""; - const QDomDocument one(fromByteArray("document", xml)); - const QDomDocument two(fromByteArray("document2", one.toByteArray(2))); + const QDomDocument one(fromByteArray("document", xml, &ok)); + QVERIFY(ok); + const QDomDocument two(fromByteArray("document2", one.toByteArray(2), &ok)); + QVERIFY(ok); QCOMPARE(expected, one.toByteArray().constData()); QCOMPARE(one.toByteArray(2).constData(), two.toByteArray(2).constData()); diff --git a/tests/auto/qxmlstream/qc14n.h b/tests/auto/qxmlstream/qc14n.h index bf8090888d..661ddeefaa 100644 --- a/tests/auto/qxmlstream/qc14n.h +++ b/tests/auto/qxmlstream/qc14n.h @@ -47,17 +47,9 @@ QT_FORWARD_DECLARE_CLASS(QString) class QC14N { public: - enum Option - { - IgnoreProcessingInstruction, - IgnoreComments - }; - typedef QFlags