Merge commit 'origin/4.5'

Conflicts:

	src/plugins/kbddrivers/usb/main.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qwidget/tst_qwidget.cpp

18 files changed, 416 insertions, 154 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index a7cc5af..b168188 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -126,7 +126,7 @@ int QApplicationPrivate::app_compile_version = 0x040000; //we don't know exactly
 QApplication::Type qt_appType=QApplication::Tty;
 QApplicationPrivate *QApplicationPrivate::self = 0;
 
-QInputContext *QApplicationPrivate::inputContext;
+QInputContext *QApplicationPrivate::inputContext = 0;
 
 bool QApplicationPrivate::quitOnLastWindowClosed = true;
 
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index a1a160e..c21ebda 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -9899,11 +9899,8 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         break;
     case Qt::WA_InputMethodEnabled: {
         QInputContext *ic = d->ic;
-        if (!ic) {
-            // implicitly create input context only if we have a focus
-            if (hasFocus())
-                ic = d->inputContext();
-        }
+        if (!ic && (!on || hasFocus()))
+            ic = d->inputContext();
         if (ic) {
             if (on && hasFocus() && ic->focusWidget() != this && isEnabled()) {
                 ic->setFocusWidget(this);
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index ade8554..4928b67 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -241,7 +241,7 @@ public:
     void fillRects(const QRectF *rects, int count);
     void drawRects(const QRectF *rects, int count);
 
-    void drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap);
+    void drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap, const QPointF &pos);
     void blit(const QRectF &dest, IDirectFBSurface *surface, const QRectF &src);
 
     inline void updateClip();
@@ -284,6 +284,7 @@ private:
     bool unsupportedCompositionMode;
 
     QDirectFBPaintEngine *q;
+    QRect currentClip;
     friend class QDirectFBPaintEngine;
 };
 
@@ -343,6 +344,7 @@ bool QDirectFBPaintEngine::end()
 #if (Q_DIRECTFB_VERSION >= 0x010000)
     d->surface->ReleaseSource(d->surface);
 #endif
+    d->currentClip = QRect();
     d->surface->SetClip(d->surface, NULL);
     d->surface = 0;
     return QRasterPaintEngine::end();
@@ -613,30 +615,26 @@ void QDirectFBPaintEngine::drawPixmap(const QPointF &p, const QPixmap &pm)
 
 void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r,
                                            const QPixmap &pixmap,
-                                           const QPointF &sp)
+                                           const QPointF &offset)
 {
     Q_D(QDirectFBPaintEngine);
     d->updateClip();
     if (pixmap.pixmapData()->classId() != QPixmapData::DirectFBClass) {
-        RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), sp);
+        RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset);
         d->lock();
-        QRasterPaintEngine::drawTiledPixmap(r, pixmap, sp);
-    } else if (d->unsupportedCompositionMode || !d->dfbCanHandleClip(r) || d->matrixRotShear || !sp.isNull()
+        QRasterPaintEngine::drawTiledPixmap(r, pixmap, offset);
+    } else if (d->unsupportedCompositionMode || !d->dfbCanHandleClip(r) || d->matrixRotShear
                || d->scale == QDirectFBPaintEnginePrivate::NegativeScale) {
-        RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), sp);
+        RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset);
         const QImage *img = static_cast<QDirectFBPixmapData*>(pixmap.pixmapData())->buffer(DSLF_READ);
         d->lock();
         QRasterPixmapData *data = new QRasterPixmapData(QPixmapData::PixmapType);
         data->fromImage(*img, Qt::AutoColor);
         const QPixmap pix(data);
-        QRasterPaintEngine::drawTiledPixmap(r, pix, sp);
+        QRasterPaintEngine::drawTiledPixmap(r, pix, offset);
     } else {
         d->unlock();
-        QPixmapData *data = pixmap.pixmapData();
-        Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
-        QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
-        dfbData->unlockDirectFB();
-        d->drawTiledPixmap(r, pixmap);
+        d->drawTiledPixmap(r, pixmap, offset);
     }
 }
 
@@ -733,14 +731,17 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
             d->surface->FillRectangle(d->surface, r.x(), r.y(),
                                       r.width(), r.height());
             return; }
-        case Qt::TexturePattern:
-            if (state()->brushOrigin == QPointF() && brush.transform().isIdentity()) {
-                //could handle certain types of brush.transform() E.g. scale
-                d->unlock();
-                d->drawTiledPixmap(rect, brush.texture());
-                return;
-            }
-            break;
+        case Qt::TexturePattern: {
+            if (d->scale == QDirectFBPaintEnginePrivate::NegativeScale)
+                break;
+
+            const QPixmap texture = brush.texture();
+            if (texture.pixmapData()->classId() != QPixmapData::DirectFBClass)
+                break;
+
+            d->unlock();
+            d->drawTiledPixmap(rect, texture, rect.topLeft() - state()->brushOrigin);
+            return; }
         default:
             break;
         }
@@ -1077,55 +1078,105 @@ void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s,
         DirectFBError("QDirectFBPaintEngine::drawPixmap()", result);
 }
 
-void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest,
-                                                  const QPixmap &pixmap)
+static inline qreal fixCoord(qreal rect_pos, qreal pixmapSize, qreal offset)
 {
+    qreal pos = rect_pos - offset;
+    while (pos > rect_pos)
+        pos -= pixmapSize;
+    while (pos + pixmapSize < rect_pos)
+        pos += pixmapSize;
+    return pos;
+}
+
+void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap, const QPointF &off)
+{
+    Q_ASSERT(!dirtyClip);
+    const QRect destinationRect = transform.mapRect(dest).toRect().normalized();
+    QRect newClip = destinationRect;
+    if (!currentClip.isEmpty())
+        newClip &= currentClip;
+
+    if (newClip.isNull())
+        return;
+
+    const DFBRegion clip = {
+        newClip.x(),
+        newClip.y(),
+        newClip.x() + newClip.width() - 1,
+        newClip.y() + newClip.height() - 1
+    };
+    surface->SetClip(surface, &clip);
+
+    QPointF offset = off;
+    Q_ASSERT(transform.type() <= QTransform::TxScale);
     prepareForBlit(pixmap.hasAlphaChannel());
     QPixmapData *data = pixmap.pixmapData();
     Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
     QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
-    IDirectFBSurface *s = dfbData->directFBSurface();
-    const QRect dr = transform.mapRect(dest).toRect();
-    DFBResult result = DFB_OK;
-
-    if (scale == NoScale && dr == QRect(0, 0, fbWidth, fbHeight)) {
-        result = surface->TileBlit(surface, s, 0, 0, 0);
-    } else if (scale == NoScale) {
-        const int dx = pixmap.width();
-        const int dy = pixmap.height();
-        const DFBRectangle rect = { 0, 0, dx, dy };
-        QVarLengthArray<DFBRectangle> rects;
-        QVarLengthArray<DFBPoint> points;
-
-        for (int y = dr.y(); y <= dr.bottom(); y += dy) {
-            for (int x = dr.x(); x <= dr.right(); x += dx) {
-                rects.append(rect);
-                const DFBPoint point = { x, y };
-                points.append(point);
+    dfbData->unlockDirectFB();
+    const QSize pixmapSize = dfbData->size();
+    IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
+    if (transform.isScaling()) {
+        Q_ASSERT(qMin(transform.m11(), transform.m22()) >= 0);
+        offset.rx() *= transform.m11();
+        offset.ry() *= transform.m22();
+
+        const QSizeF mappedSize(pixmapSize.width() * transform.m11(), pixmapSize.height() * transform.m22());
+        qreal y = ::fixCoord(destinationRect.y(), mappedSize.height(), offset.y());
+        const qreal startX = ::fixCoord(destinationRect.x(), mappedSize.width(), offset.x());
+        while (y < destinationRect.bottom()) {
+            qreal x = startX;
+            while (x < destinationRect.right()) {
+                const DFBRectangle destination = { qRound(x), qRound(y), mappedSize.width(), mappedSize.height() };
+                surface->StretchBlit(surface, sourceSurface, 0, &destination);
+                x += mappedSize.width();
             }
+            y += mappedSize.height();
         }
-        result = surface->BatchBlit(surface, s, rects.constData(),
-                                    points.constData(), points.size());
     } else {
-        const QRect sr = transform.mapRect(QRect(0, 0, pixmap.width(), pixmap.height()));
-        const int dx = sr.width();
-        const int dy = sr.height();
-        const DFBRectangle sRect = { 0, 0, dx, dy };
-
-        for (int y = dr.y(); y <= dr.bottom(); y += dy) {
-            for (int x = dr.x(); x <= dr.right(); x += dx) {
-                const DFBRectangle dRect = { x, y, dx, dy };
-                result = surface->StretchBlit(surface, s, &sRect, &dRect);
-                if (result != DFB_OK) {
-                    y = dr.bottom() + 1;
-                    break;
-                }
+        qreal y = ::fixCoord(destinationRect.y(), pixmapSize.height(), offset.y());
+        const qreal startX = ::fixCoord(destinationRect.x(), pixmapSize.width(), offset.x());
+        int horizontal = qMax(1, destinationRect.width() / pixmapSize.width()) + 1;
+        if (startX != destinationRect.x())
+            ++horizontal;
+        int vertical = qMax(1, destinationRect.height() / pixmapSize.height()) + 1;
+        if (y != destinationRect.y())
+            ++vertical;
+
+        const int maxCount = (vertical * horizontal);
+        QVarLengthArray<DFBRectangle, 16> sourceRects(maxCount);
+        QVarLengthArray<DFBPoint, 16> points(maxCount);
+
+        int i = 0;
+        while (y < destinationRect.bottom()) {
+            Q_ASSERT(i < maxCount);
+            qreal x = startX;
+            while (x < destinationRect.right()) {
+                points[i].x = qRound(x);
+                points[i].y = qRound(y);
+                sourceRects[i].x = 0;
+                sourceRects[i].y = 0;
+                sourceRects[i].w = int(pixmapSize.width());
+                sourceRects[i].h = int(pixmapSize.height());
+                x += pixmapSize.width();
+                ++i;
             }
+            y += pixmapSize.height();
         }
+        surface->BatchBlit(surface, sourceSurface, sourceRects.constData(), points.constData(), i);
     }
 
-    if (result != DFB_OK)
-        DirectFBError("QDirectFBPaintEngine::drawTiledPixmap()", result);
+    if (currentClip.isEmpty()) {
+        surface->SetClip(surface, 0);
+    } else {
+        const DFBRegion clip = {
+            currentClip.x(),
+            currentClip.y(),
+            currentClip.x() + currentClip.width(),
+            currentClip.y() + currentClip.height()
+        };
+        surface->SetClip(surface, &clip);
+    }
 }
 
 void QDirectFBPaintEnginePrivate::updateClip()
@@ -1133,6 +1184,7 @@ void QDirectFBPaintEnginePrivate::updateClip()
     if (!dirtyClip)
         return;
 
+    currentClip = QRect();
     const QClipData *clipData = clip();
     if (!clipData || !clipData->enabled) {
         surface->SetClip(surface, NULL);
@@ -1145,6 +1197,8 @@ void QDirectFBPaintEnginePrivate::updateClip()
             clipData->clipRect.y() + clipData->clipRect.height()
         };
         surface->SetClip(surface, &r);
+        currentClip = clipData->clipRect.normalized();
+        // ### is this guaranteed to always be normalized?
         dfbHandledClip = true;
     } else if (clipData->hasRegionClip && ignoreSystemClip && clipData->clipRegion == systemClip) {
         dfbHandledClip = true;
diff --git a/src/plugins/kbddrivers/sl5000/main.cpp b/src/plugins/kbddrivers/sl5000/main.cpp
index 4d61266..cc68747 100644
--- a/src/plugins/kbddrivers/sl5000/main.cpp
+++ b/src/plugins/kbddrivers/sl5000/main.cpp
@@ -66,10 +66,9 @@ QStringList QSL5000KbdDriver::keys() const
 QWSKeyboardHandler* QSL5000KbdDriver::create(const QString &driver,
                                              const QString &device)
 {
-    Q_UNUSED(device);
     if (driver.compare(QLatin1String("SL5000"), Qt::CaseInsensitive))
         return 0;
-    return new QWSSL5000KeyboardHandler(driver);
+    return new QWSSL5000KeyboardHandler(device);
 }
 
 Q_EXPORT_PLUGIN2(qwssl5000kbddriver, QSL5000KbdDriver)
diff --git a/src/plugins/kbddrivers/vr41xx/main.cpp b/src/plugins/kbddrivers/vr41xx/main.cpp
index 2cba1f7..c9ba4d7 100644
--- a/src/plugins/kbddrivers/vr41xx/main.cpp
+++ b/src/plugins/kbddrivers/vr41xx/main.cpp
@@ -66,10 +66,9 @@ QStringList QVr41xxKbdDriver::keys() const
 QWSKeyboardHandler* QVr41xxKbdDriver::create(const QString &driver,
                                              const QString &device)
 {
-    Q_UNUSED(device);
     if (driver.compare(QLatin1String("VR41xx"), Qt::CaseInsensitive))
         return 0;
-    return new QWSVr41xxKeyboardHandler(driver);
+    return new QWSVr41xxKeyboardHandler(device);
 }
 
 Q_EXPORT_PLUGIN2(qwsvr41xxkbddriver, QVr41xxKbdDriver)
diff --git a/src/plugins/kbddrivers/yopy/main.cpp b/src/plugins/kbddrivers/yopy/main.cpp
index bfddabe..7079d88 100644
--- a/src/plugins/kbddrivers/yopy/main.cpp
+++ b/src/plugins/kbddrivers/yopy/main.cpp
@@ -66,10 +66,9 @@ QStringList QYopyKbdDriver::keys() const
 QWSKeyboardHandler* QYopyKbdDriver::create(const QString &driver,
                                            const QString &device)
 {
-    Q_UNUSED(device);
     if (driver.compare(QLatin1String("Yopy"), Qt::CaseInsensitive))
         return 0;
-    return new QWSYopyKeyboardHandler(driver);
+    return new QWSYopyKeyboardHandler(device);
 }
 
 Q_EXPORT_PLUGIN2(qwsyopykbddriver, QYopyKbdDriver)
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index bd93a9a..c61c526 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -59,21 +59,29 @@
 #include <pg_config.h>
 
 #include <stdlib.h>
-#if defined(_MSC_VER)
-#include <float.h>
-#define isnan(x) _isnan(x)
-int isinf(double x) 
-{ 
-    if(_fpclass(x) == _FPCLASS_NINF) 
-        return -1; 
-    else if(_fpclass(x) == _FPCLASS_PINF) 
-        return 1; 
-    else return 0;
-}
-#else
 #include <math.h>
+// below code taken from an example at http://www.gnu.org/software/hello/manual/autoconf/Function-Portability.html
+#ifndef isnan
+    # define isnan(x) \
+        (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
+        : sizeof (x) == sizeof (double) ? isnan_d (x) \
+        : isnan_f (x))
+    static inline int isnan_f  (float       x) { return x != x; }
+    static inline int isnan_d  (double      x) { return x != x; }
+    static inline int isnan_ld (long double x) { return x != x; }
 #endif
 
+#ifndef isinf
+    # define isinf(x) \
+        (sizeof (x) == sizeof (long double) ? isinf_ld (x) \
+        : sizeof (x) == sizeof (double) ? isinf_d (x) \
+        : isinf_f (x))
+    static inline int isinf_f  (float       x) { return isnan (x - x); }
+    static inline int isinf_d  (double      x) { return isnan (x - x); }
+    static inline int isinf_ld (long double x) { return isnan (x - x); }
+#endif
+
+
 // workaround for postgres defining their OIDs in a private header file
 #define QBOOLOID 16
 #define QINT8OID 20
@@ -615,10 +623,9 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection)
 {
     QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6;
     PGresult* result = PQexec(connection, "select version()");
-    int status =  PQresultStatus(result);
+    int status = PQresultStatus(result);
     if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) {
         QString val = QString::fromAscii(PQgetvalue(result, 0, 0));
-        PQclear(result);
         QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)"));
         rx.setMinimal(true); // enforce non-greedy RegExp
         if (rx.indexIn(val) != -1) {
@@ -659,6 +666,7 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection)
             }
         }
     }
+    PQclear(result);
 
     if (serverVersion < QPSQLDriver::Version71)
         qWarning("This version of PostgreSQL is not supported and may not work.");
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 156af26..4315a8c 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -205,7 +205,7 @@ bool QSqlTableModelPrivate::exec(const QString &stmt, bool prepStatement,
                 editQuery.addBindValue(rec.value(i));
         }
         for (i = 0; i < whereValues.count(); ++i) {
-            if (whereValues.isGenerated(i))
+            if (whereValues.isGenerated(i) && !whereValues.isNull(i))
                 editQuery.addBindValue(whereValues.value(i));
         }
 
@@ -538,6 +538,7 @@ bool QSqlTableModel::setData(const QModelIndex &index, const QVariant &value, in
         isOk = updateRowInTable(index.row(), d->editBuffer);
         if (isOk)
             select();
+        emit dataChanged(index, index);
         break; }
     case OnRowChange:
         if (index.row() == d->insertIndex) {
diff --git a/tests/auto/linguist/lconvert/data/makeplurals.pl b/tests/auto/linguist/lconvert/data/makeplurals.pl
new file mode 100755
index 0000000..19bffe0
--- /dev/null
+++ b/tests/auto/linguist/lconvert/data/makeplurals.pl
@@ -0,0 +1,42 @@
+#! /usr/bin/env perl
+
+sub makeit2($$$)
+{
+    for (my $i = 0; $i < (1 << $_[0]); $i++) {
+        print OUTFILE "\n";
+        print OUTFILE "$_[2]\n" unless $3 eq "";
+        print OUTFILE "msgid \"singular $_[1] $i\"\n";
+        print OUTFILE "msgid_plural \"plural $_[1] $i\"\n";
+        for (my $j = 0; $j < $_[0]; $j++) {
+            my $tr;
+            if (($i & (1 << $j)) == 0) {
+                $tr = "translated $_[1] $i $j";
+            }
+            print OUTFILE "msgstr[$j] \"$tr\"\n";
+        }
+    }
+}
+
+sub makeit($$)
+{
+    open OUTFILE, ">${OUTDIR}plural-$_[0].po" || die "cannot write file in $OUTDIR";
+    print OUTFILE <<EOF;
+msgid ""
+msgstr ""
+"X-FooBar: yup\\n"
+"X-Language: $_[1]\\n"
+EOF
+    makeit2($_[0], "one", "");
+    makeit2($_[0], "two", "#, fuzzy
+#| msgid \"old untranslated one\"");
+    makeit2($_[0], "three", "#, fuzzy
+#| msgid \"old untranslated two\"
+#| msgid_plural \"old untranslated plural two\"");
+    makeit2($_[0], "four", "#, fuzzy
+#| msgid_plural \"old untranslated only plural three\"");
+}
+
+$OUTDIR = $ARGV[0];
+makeit(1, "zh_CN");
+makeit(2, "de_DE");
+makeit(3, "pl_PL");
diff --git a/tests/auto/linguist/lconvert/data/makeplurals.sh b/tests/auto/linguist/lconvert/data/makeplurals.sh
deleted file mode 100755
index 2e0f375..0000000
--- a/tests/auto/linguist/lconvert/data/makeplurals.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/bash
-
-function makeit2()
-{
-    for ((i = 0; i < (1 << $1); i++)); do
-        echo
-        test -n "$3" && echo "$3"
-        echo "msgid \"singular $2 $i\""
-        echo "msgid_plural \"plural $2 $i\""
-        for ((j = 0; j < $1; j++)); do
-            tr=
-            if test $((i & (1 << j))) = 0; then
-                tr="translated $2 $i $j"
-            fi
-            echo "msgstr[$j] \"$tr\""
-        done
-    done
-}
-
-function makeit()
-{
-    {
-        cat <<EOF
-msgid ""
-msgstr ""
-"X-FooBar: yup\n"
-"X-Language: $2\n"
-EOF
-        makeit2 $1 one ""
-        makeit2 $1 two "#, fuzzy
-#| msgid \"old untranslated one\""
-        makeit2 $1 three "#, fuzzy
-#| msgid \"old untranslated two\"
-#| msgid_plural \"old untranslated plural two\""
-        makeit2 $1 four "#, fuzzy
-#| msgid_plural \"old untranslated only plural three\""
-    } > ${OUTDIR}plural-$1.po
-}
-
-OUTDIR=$1
-makeit 1 zh_CN
-makeit 2 de_DE
-makeit 3 pl_PL
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp
index 40be55a..1ed71ab 100644
--- a/tests/auto/linguist/lconvert/tst_lconvert.cpp
+++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp
@@ -47,7 +47,7 @@ class tst_lconvert : public QObject
     Q_OBJECT
 
 public:
-    tst_lconvert() : dataDir("data/") {}
+    tst_lconvert() : dataDir("data/"), binDir(QLibraryInfo::location(QLibraryInfo::BinariesPath)) {}
 
 private slots:
     void initTestCase();
@@ -73,12 +73,13 @@ private:
             const QList<QStringList> &args);
 
     QString dataDir;
+    QString binDir;
 };
 
 void tst_lconvert::initTestCase()
 {
     if (!QFile::exists(QLatin1String("data/plural-1.po")))
-        QProcess::execute(QLatin1String("data/makeplurals.sh"), QStringList() << QLatin1String("data/"));
+        QProcess::execute(QLatin1String("perl"), QStringList() << QLatin1String("data/makeplurals.pl") << QLatin1String("data/"));
     QVERIFY(QFile::exists(QLatin1String("data/plural-1.po")));
 }
 
@@ -151,7 +152,7 @@ void tst_lconvert::doCompare(QIODevice *actualDev, const QString &expectedFn)
 void tst_lconvert::verifyReadFail(const QString &fn)
 {
     QProcess cvt;
-    cvt.start("lconvert", QStringList() << (dataDir + fn));
+    cvt.start(binDir + "/lconvert", QStringList() << (dataDir + fn));
     QVERIFY(cvt.waitForFinished(1000));
     QVERIFY(cvt.exitStatus() == QProcess::NormalExit);
     QVERIFY2(cvt.exitCode() == 2, "Accepted invalid input");
@@ -178,7 +179,7 @@ void tst_lconvert::convertChain(const QString &_inFileName, const QString &_outF
         if (!argList.isEmpty())
             args += argList[i];
         args << "-if" << stations[i] << "-i" << "-" << "-of" << stations[i + 1];
-        cvts.at(i)->start("lconvert", args);
+        cvts.at(i)->start(binDir + "/lconvert", args);
     }
     int st = 0;
     foreach (QProcess *cvt, cvts)
@@ -242,7 +243,7 @@ void tst_lconvert::converts()
     QString outFileNameFq = dataDir + outFileName;
 
     QProcess cvt;
-    cvt.start("lconvert", QStringList() << "-i" << (dataDir + inFileName) << "-of" << format);
+    cvt.start(binDir + "/lconvert", QStringList() << "-i" << (dataDir + inFileName) << "-of" << format);
     doWait(&cvt, 0);
     if (QTest::currentTestFailed())
         return;
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp
index ff90b3c..45e9d6b 100644
--- a/tests/auto/linguist/lrelease/tst_lrelease.cpp
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -49,6 +49,10 @@
 class tst_lrelease : public QObject
 {
     Q_OBJECT
+
+public:
+    tst_lrelease() : binDir(QLibraryInfo::location(QLibraryInfo::BinariesPath)) {}
+
 private:
 
 private slots:
@@ -60,6 +64,8 @@ private slots:
 
 private:
     void doCompare(const QStringList &actual, const QString &expectedFn);
+
+    QString binDir;
 };
 
 void tst_lrelease::doCompare(const QStringList &actual, const QString &expectedFn)
@@ -112,7 +118,7 @@ void tst_lrelease::doCompare(const QStringList &actual, const QString &expectedF
 
 void tst_lrelease::translate()
 {
-    QVERIFY(!QProcess::execute("lrelease testdata/translate.ts"));
+    QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/translate.ts"));
 
     QTranslator translator;
     QVERIFY(translator.load("testdata/translate.qm"));
@@ -162,8 +168,8 @@ void tst_lrelease::translate()
 
 void tst_lrelease::mixedcodecs()
 {
-    QVERIFY(!QProcess::execute("lrelease testdata/mixedcodecs-ts11.ts"));
-    QVERIFY(!QProcess::execute("lrelease testdata/mixedcodecs-ts20.ts"));
+    QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/mixedcodecs-ts11.ts"));
+    QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/mixedcodecs-ts20.ts"));
     QVERIFY(!QProcess::execute("cmp testdata/mixedcodecs-ts11.qm testdata/mixedcodecs-ts20.qm"));
     QTranslator translator;
     QVERIFY(translator.load("testdata/mixedcodecs-ts11.qm"));
@@ -177,7 +183,7 @@ void tst_lrelease::mixedcodecs()
 
 void tst_lrelease::compressed()
 {
-    QVERIFY(!QProcess::execute("lrelease -compress testdata/compressed.ts"));
+    QVERIFY(!QProcess::execute(binDir + "/lrelease -compress testdata/compressed.ts"));
 
     QTranslator translator;
     QVERIFY(translator.load("testdata/compressed.qm"));
@@ -207,7 +213,7 @@ void tst_lrelease::idbased()
 void tst_lrelease::dupes()
 {
     QProcess proc;
-    proc.start("lrelease testdata/dupes.ts");
+    proc.start(binDir + "/lrelease testdata/dupes.ts");
     QVERIFY(proc.waitForFinished());
     QVERIFY(proc.exitStatus() == QProcess::NormalExit);
     doCompare(QString(proc.readAllStandardError()).trimmed().remove('\r').split('\n'), "testdata/dupes.errors");
diff --git a/tests/auto/linguist/lupdate/testlupdate.cpp b/tests/auto/linguist/lupdate/testlupdate.cpp
index 8abc2b0..04c03f1 100644
--- a/tests/auto/linguist/lupdate/testlupdate.cpp
+++ b/tests/auto/linguist/lupdate/testlupdate.cpp
@@ -56,8 +56,9 @@
 TestLUpdate::TestLUpdate()
 {
     childProc = 0;
-    m_cmdLupdate = QLatin1String("lupdate");
-    m_cmdQMake = QLatin1String("qmake");
+    QString binPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+    m_cmdLupdate = binPath + QLatin1String("/lupdate");
+    m_cmdQMake = binPath + QLatin1String("/qmake");
 }
 
 TestLUpdate::~TestLUpdate()
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 89e850c..8318b60 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -245,6 +245,8 @@ private Q_SLOTS:
     void authorizationError();
 
     void httpConnectionCount();
+    void httpDownloadPerformance_data();
+    void httpDownloadPerformance();
 };
 
 QT_BEGIN_NAMESPACE
@@ -3696,5 +3698,128 @@ void tst_QNetworkReply::httpConnectionCount()
     QCOMPARE(pendingConnectionCount, 6);
 }
 
+class HttpDownloadPerformanceClient : QObject {
+    Q_OBJECT;
+    QIODevice *device;
+    public:
+    HttpDownloadPerformanceClient (QIODevice *dev) : device(dev){
+        connect(dev, SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
+    }
+
+    public slots:
+    void readyReadSlot() {
+        device->readAll();
+    }
+
+};
+
+class HttpDownloadPerformanceServer : QObject {
+    Q_OBJECT;
+    qint64 dataSize;
+    qint64 dataSent;
+    QTcpServer server;
+    QTcpSocket *client;
+    bool serverSendsContentLength;
+    bool chunkedEncoding;
+
+public:
+    HttpDownloadPerformanceServer (qint64 ds, bool sscl, bool ce) : dataSize(ds), dataSent(0),
+    client(0), serverSendsContentLength(sscl), chunkedEncoding(ce) {
+        server.listen();
+        connect(&server, SIGNAL(newConnection()), this, SLOT(newConnectionSlot()));
+    }
+
+    int serverPort() {
+        return server.serverPort();
+    }
+
+public slots:
+
+    void newConnectionSlot() {
+        client = server.nextPendingConnection();
+        client->setParent(this);
+        connect(client, SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
+        connect(client, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWrittenSlot(qint64)));
+    }
+
+    void readyReadSlot() {
+        client->readAll();
+        client->write("HTTP/1.0 200 OK\n");
+        if (serverSendsContentLength)
+            client->write(QString("Content-Length: " + QString::number(dataSize) + "\n").toAscii());
+        if (chunkedEncoding)
+            client->write(QString("Transfer-Encoding: chunked\n").toAscii());
+        client->write("Connection: close\n\n");
+    }
+
+    void bytesWrittenSlot(qint64 amount) {
+        if (dataSent == dataSize && client) {
+            // close eventually
+
+            // chunked encoding: we have to send a last "empty" chunk
+            if (chunkedEncoding)
+                client->write(QString("0\r\n\r\n").toAscii());
+
+            client->disconnectFromHost();
+            server.close();
+            client = 0;
+            return;
+        }
+
+        // send data
+        if (client && client->bytesToWrite() < 100*1024 && dataSent < dataSize) {
+            qint64 amount = qMin(qint64(16*1024), dataSize - dataSent);
+            QByteArray data(amount, '@');
+
+            if (chunkedEncoding) {
+                client->write(QString(QString("%1").arg(amount,0,16).toUpper() + "\r\n").toAscii());
+                client->write(data.constData(), amount);
+                client->write(QString("\r\n").toAscii());
+            } else {
+                client->write(data.constData(), amount);
+            }
+
+            dataSent += amount;
+        }
+    }
+};
+
+void tst_QNetworkReply::httpDownloadPerformance_data()
+{
+    QTest::addColumn<bool>("serverSendsContentLength");
+    QTest::addColumn<bool>("chunkedEncoding");
+
+    QTest::newRow("Server sends no Content-Length") << false << false;
+    QTest::newRow("Server sends Content-Length")     << true << false;
+    QTest::newRow("Server uses chunked encoding")     << false << true;
+
+}
+
+void tst_QNetworkReply::httpDownloadPerformance()
+{
+    QFETCH(bool, serverSendsContentLength);
+    QFETCH(bool, chunkedEncoding);
+
+    enum {UploadSize = 1000*1024*1024}; // 1000 MB
+    HttpDownloadPerformanceServer server(UploadSize, serverSendsContentLength, chunkedEncoding);
+
+    QNetworkRequest request(QUrl("http://127.0.0.1:" + QString::number(server.serverPort()) + "/?bare=1"));
+    QNetworkReply* reply = manager.get(request);
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
+    HttpDownloadPerformanceClient client(reply);
+
+    QTime time;
+    time.start();
+    QTestEventLoop::instance().enterLoop(40);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    qint64 elapsed = time.elapsed();
+    qWarning() << "tst_QNetworkReply::httpDownloadPerformance" << elapsed << "msec, "
+            << ((UploadSize/1024.0)/(elapsed/1000.0)) << " kB/sec";
+
+    delete reply;
+}
+
 QTEST_MAIN(tst_QNetworkReply)
 #include "tst_qnetworkreply.moc"
diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
index 1445f34..a30fbdb 100644
--- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -116,6 +116,8 @@ private slots:
     void insertRecordsInLoop();
     void sqlite_attachedDatabase_data() { generic_data("QSQLITE"); }
     void sqlite_attachedDatabase(); // For task 130799
+    void tableModifyWithBlank_data() { generic_data(); }
+    void tableModifyWithBlank(); // For mail task
 
 private:
     void generic_data(const QString& engine=QString());
@@ -141,6 +143,7 @@ void tst_QSqlTableModel::dropTestTables()
         tableNames << qTableName("test")
                    << qTableName("test2")
                    << qTableName("test3")
+                   << qTableName("test4")
                    << qTableName("emptytable")
                    << qTableName("bigtable")
                    << qTableName("foo");
@@ -167,6 +170,8 @@ void tst_QSqlTableModel::createTestTables()
 
         QVERIFY_SQL( q, exec("create table " + qTableName("test3") + "(id int, random varchar(20), randomtwo varchar(20))"));
 
+        QVERIFY_SQL( q, exec("create table " + qTableName("test4") + "(column1 varchar(50), column2 varchar(50), column3 varchar(50))"));
+
         QVERIFY_SQL( q, exec("create table " + qTableName("emptytable") + "(id int)"));
 
         if (testWhiteSpaceNames(db.driverName())) {
@@ -927,5 +932,62 @@ void tst_QSqlTableModel::sqlite_attachedDatabase()
     QCOMPARE(model.data(model.index(0, 1), Qt::DisplayRole).toString(), QLatin1String("main"));
 }
 
+
+void tst_QSqlTableModel::tableModifyWithBlank()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    QSqlTableModel model(0, db);
+    model.setTable(qTableName("test4"));
+    model.select();
+
+    //generate a time stamp for the test. Add one second to the current time to make sure

+    //it is different than the QSqlQuery test.

+    QString timeString=QDateTime::currentDateTime().addSecs(1).toString(Qt::ISODate);

+

+    //insert a new row, with column0 being the timestamp.

+    //Should be equivalent to QSqlQuery INSERT INTO... command)

+    QVERIFY_SQL(model, insertRow(0));
+    QVERIFY_SQL(model, setData(model.index(0,0),timeString));
+    QVERIFY_SQL(model, submitAll());
+

+    //set a filter on the table so the only record we get is the one we just made

+    //I could just do another setData command, but I want to make sure the TableModel

+    //matches exactly what is stored in the database

+    model.setFilter("column1='"+timeString+"'"); //filter to get just the newly entered row
+    QVERIFY_SQL(model, select());
+
+    //Make sure we only get one record, and that it is the one we just made

+    QCOMPARE(model.rowCount(), 1); //verify only one entry
+    QCOMPARE(model.record(0).value(0).toString(), timeString); //verify correct record
+
+    //At this point we know that the intial value (timestamp) was succsefully stored in the database

+    //Attempt to modify the data in the new record

+    //equivalent to query.exec("update test set column3="... command in direct test

+    //set the data in the first column to "col1ModelData"

+    QVERIFY_SQL(model, setData(model.index(0,1), "col1ModelData"));
+
+    //do a quick check to make sure that the setData command properly set the value in the model

+    QCOMPARE(model.record(0).value(1).toString(), QLatin1String("col1ModelData"));
+
+    //submit the changed data to the database

+    //This is where I have been getting errors.

+    QVERIFY_SQL(model, submitAll());
+
+    //make sure the model has the most current data for our record

+    QVERIFY_SQL(model, select());
+
+    //verify that our new record was the only record returned

+    QCOMPARE(model.rowCount(), 1);
+
+    //And that the record returned is, in fact, our test record.

+    QCOMPARE(model.record(0).value(0).toString(), timeString);
+
+    //Make sure the value of the first column matches what we set it to previously.

+    QCOMPARE(model.record(0).value(1).toString(), QLatin1String("col1ModelData"));
+}
+
 QTEST_MAIN(tst_QSqlTableModel)
 #include "tst_qsqltablemodel.moc"
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index fa36496..0f0a1af 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -351,6 +351,7 @@ private slots:
 #endif
     void updateOnDestroyedSignal();
     void toplevelLineEditFocus();
+    void inputFocus_task257832();
 
     void focusWidget_task254563();
     void rectOutsideCoordinatesLimit_task144779();
@@ -9152,5 +9153,19 @@ void tst_QWidget::rectOutsideCoordinatesLimit_task144779()
     QCOMPARE(pixmap.toImage().copy(center), correct.toImage().copy(center));
 }
 
+void tst_QWidget::inputFocus_task257832()
+{
+      QLineEdit *widget = new QLineEdit;
+      QInputContext *context = widget->inputContext();
+      if (!context)
+            QSKIP("No input context", SkipSingle);
+      widget->setFocus();
+      context->setFocusWidget(widget);
+      QCOMPARE(context->focusWidget(), widget);
+      widget->setReadOnly(true);
+      QVERIFY(!context->focusWidget());
+      delete widget;
+}
+
 QTEST_MAIN(tst_QWidget)
 #include "tst_qwidget.moc"
diff --git a/tools/designer/src/designer/qdesigner_workbench.cpp b/tools/designer/src/designer/qdesigner_workbench.cpp
index 04cd105..2ac9e1f 100644
--- a/tools/designer/src/designer/qdesigner_workbench.cpp
+++ b/tools/designer/src/designer/qdesigner_workbench.cpp
@@ -410,6 +410,12 @@ void QDesignerWorkbench::switchToDockedMode()
 
     switchToNeutralMode();
 
+#ifndef Q_WS_MAC
+    QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow();
+    widgetBoxWrapper->action()->setVisible(true);
+    widgetBoxWrapper->setWindowTitle(tr("Widget Box"));
+#endif
+
     m_mode = DockedMode;
     const QDesignerSettings settings(m_core);
     m_dockedMainWindow = new DockedMainWindow(this, m_toolbarMenu, m_toolWindows);
@@ -462,7 +468,6 @@ void QDesignerWorkbench::switchToTopLevelMode()
     // make sure that the widgetbox is visible if it is different from neutral.
     QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow();
     Q_ASSERT(widgetBoxWrapper);
-    const bool needWidgetBoxWrapperVisible = widgetBoxWrapper->action()->isChecked();
 
     switchToNeutralMode();
     const QPoint desktopOffset = desktopGeometry().topLeft();
@@ -501,9 +506,6 @@ void QDesignerWorkbench::switchToTopLevelMode()
         found_visible_window |= tw->isVisible();
     }
 
-    if (needWidgetBoxWrapperVisible)
-        widgetBoxWrapper->action()->trigger();
-
     if (!m_toolWindows.isEmpty() && !found_visible_window)
         m_toolWindows.first()->show();
 
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index 47c1ec2..a962152 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -68,8 +68,10 @@
 
 #ifdef Q_OS_WIN32
 #define QT_POPEN _popen
+#define QT_PCLOSE _pclose
 #else
 #define QT_POPEN popen
+#define QT_PCLOSE pclose
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -1513,6 +1515,8 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
                         output += QLatin1String(buff);
                     }
                     ret += split_value_list(output);
+                    if (proc)
+                        QT_PCLOSE(proc);
                 }
             }
             break;
@@ -2067,7 +2071,7 @@ bool ProFileEvaluator::Private::evaluateFile(const QString &fileName, bool *resu
     ProFile *pro = q->parsedProFile(fileName);
     if (pro) {
         m_profileStack.push(pro);
-        ok = (currentProFile() ? pro->Accept(this) : false);
+        ok = pro->Accept(this);
         m_profileStack.pop();
         q->releaseParsedProFile(pro);
 
@@ -2077,16 +2081,6 @@ bool ProFileEvaluator::Private::evaluateFile(const QString &fileName, bool *resu
         if (result)
             *result = false;
     }
-/*    if (ok && readFeatures) {
-        QStringList configs = values("CONFIG");
-        QSet<QString> processed;
-        foreach (const QString &fn, configs) {
-            if (!processed.contains(fn)) {
-                processed.insert(fn);
-                evaluateFeatureFile(fn, 0);
-            }
-        }
-    } */
 
     return ok;
 }