Merge commit 'qt/master'

14 files changed, 113 insertions, 31 deletions

diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index e49ab13..2eb7c08 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -3159,7 +3159,7 @@ xpathbison.dependency_type = TYPE_C
 xpathbison.variable_out = GENERATED_SOURCES
 addExtraCompilerWithHeader(xpathbison)
 
-include($$PWD/../WebKit/qt/Api/headers.pri)
+include($$PWD/../WebKit/qt/Api/headers.pri, "", true)
 HEADERS += $$WEBKIT_API_HEADERS
 !CONFIG(QTDIR_build) {
     target.path = $$[QT_INSTALL_LIBS]
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
index 9f0e289..a25027b 100644
--- a/src/corelib/arch/arch.pri
+++ b/src/corelib/arch/arch.pri
@@ -28,4 +28,4 @@ vxworks:HEADERS += arch/qatomic_vxworks.h
 
 QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH
 DEPENDPATH += $$QT_ARCH_CPP
-include($$QT_ARCH_CPP/arch.pri)
+include($$QT_ARCH_CPP/arch.pri, "", true)
diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp
index e32fc03..6dbad34 100644
--- a/src/corelib/tools/qtimeline.cpp
+++ b/src/corelib/tools/qtimeline.cpp
@@ -69,7 +69,6 @@ public:
     int currentLoopCount;
 
     int currentTime;
-    int elapsedTime;
     int timerId;
     QTime timer;
 
@@ -212,7 +211,7 @@ void QTimeLinePrivate::setCurrentTime(int msecs)
     applies an interpolation algorithm to generate these value. You can choose
     from a set of predefined timeline algorithms by calling
     setCurveShape().
-   
+
     Note that by default, QTimeLine uses the EaseInOut curve shape,
     which provides a value that grows slowly, then grows steadily, and
     finally grows slowly. For a custom timeline, you can reimplement
@@ -549,7 +548,7 @@ void QTimeLine::setCurveShape(CurveShape shape)
     case CosineCurve:
         setEasingCurve(QEasingCurve(QEasingCurve::CosineCurve));
         break;
-    } 
+    }
 }
 
 /*!
@@ -559,7 +558,7 @@ void QTimeLine::setCurveShape(CurveShape shape)
 
     Specifies the easing curve that the timeline will use.
     If both easing curve and curveShape are set, the last set property will
-    override the previous one. (If valueForTime() is reimplemented it will 
+    override the previous one. (If valueForTime() is reimplemented it will
     override both)
 */
 
@@ -663,6 +662,7 @@ qreal QTimeLine::valueForTime(int msec) const
     second). You can change the update interval by calling
     setUpdateInterval().
 
+    The timeline will start from position 0, or the end if going backward.
     If you want to resume a stopped timeline without restarting, you can call
     resume() instead.
 
@@ -675,10 +675,8 @@ void QTimeLine::start()
         qWarning("QTimeLine::start: already running");
         return;
     }
-    int curTime = d->currentTime;
-    if (curTime == d->duration && d->direction == Forward)
-        curTime = 0;
-    else if (curTime == 0 && d->direction == Backward)
+    int curTime = 0;
+    if (d->direction == Backward)
         curTime = d->duration;
     d->timerId = startTimer(d->updateInterval);
     d->startTime = curTime;
@@ -694,7 +692,7 @@ void QTimeLine::start()
     frame and value at regular intervals.
 
     In contrast to start(), this function does not restart the timeline before
-    is resumes.
+    it resumes.
 
     \sa start(), updateInterval(), frameChanged(), valueChanged()
 */
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index 9e73176..c326b01 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -80,11 +80,7 @@
 #include "qgraphicsitem_p.h"
 #include "qgraphicstransform_p.h"
 #include <QDebug>
-
-#include <math.h>
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
+#include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -355,7 +351,6 @@ public:
     QGraphicsRotationPrivate()
             : angle(0) {}
     QPointF origin;
-    qreal originY;
     qreal angle;
 };
 
@@ -475,13 +470,18 @@ void QGraphicsRotation::applyTo(QTransform *t) const
     By default the axis is (0, 0, 1), giving QGraphicsRotation3D the same
     default behavior as QGraphicsRotation (i.e., rotation around the Z axis).
 
+    Note: the final rotation is the combined effect of a rotation in
+    3D space followed by a projection back to 2D.  If several rotations
+    are performed in succession, they will not behave as expected unless
+    they were all around the Z axis.
+
     \sa QGraphicsTransform, QGraphicsItem::setRotation(), QTransform::rotate()
 */
 
 class QGraphicsRotation3DPrivate : public QGraphicsRotationPrivate
 {
 public:
-    QGraphicsRotation3DPrivate() {}
+    QGraphicsRotation3DPrivate() : axis(0, 0, 1) {}
 
     QVector3D axis;
 };
@@ -522,10 +522,14 @@ QVector3D QGraphicsRotation3D::axis()
 void QGraphicsRotation3D::setAxis(const QVector3D &axis)
 {
     Q_D(QGraphicsRotation3D);
+    if (d->axis == axis)
+        return;
     d->axis = axis;
     update();
+    emit axisChanged();
 }
 
+const qreal deg2rad = qreal(0.017453292519943295769);        // pi/180
 static const qreal inv_dist_to_plane = 1. / 1024.;
 
 /*!
@@ -535,13 +539,27 @@ void QGraphicsRotation3D::applyTo(QTransform *t) const
 {
     Q_D(const QGraphicsRotation3D);
 
-    if (d->angle == 0. ||
+    qreal a = d->angle;
+
+    if (a == 0. ||
         (d->axis.z() == 0. && d->axis.y() == 0 && d->axis.x() == 0))
         return;
 
-    qreal rad = d->angle * 2. * M_PI / 360.;
-    qreal c = ::cos(rad);
-    qreal s = ::sin(rad);
+    qreal c, s;
+    if (a == 90. || a == -270.) {
+        s = 1.;
+        c = 0.;
+    } else if (a == 270. || a == -90.) {
+        s = -1.;
+        c = 0.;
+    } else if (a == 180.) {
+        s = 0.;
+        c = -1.;
+    } else {
+        qreal b = deg2rad*a;
+        s = qSin(b);
+        c = qCos(b);
+    }
 
     qreal x = d->axis.x();
     qreal y = d->axis.y();
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 2bb3626..056e26b 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -512,6 +512,13 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         dialog = popup = false;                        // force these flags off
         data.crect.setRect(0, 0, sw, sh);
     } else if (topLevel && !q->testAttribute(Qt::WA_Resized)) {
+        QDesktopWidget *desktopWidget = qApp->desktop();
+        if (desktopWidget->isVirtualDesktop()) {
+            QRect r = desktopWidget->screenGeometry();
+            sw = r.width();
+            sh = r.height();
+        }
+
         int width = sw / 2;
         int height = 4 * sh / 10;
         if (extra) {
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 90fd9a5..6f2024f 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -341,4 +341,29 @@ QImage::Format QVGPixmapData::sourceFormat() const
     return QImage::Format_ARGB32_Premultiplied;
 }
 
+/*
+    \internal
+
+    Returns the VGImage that is storing the contents of \a pixmap.
+    Returns VG_INVALID_HANDLE if \a pixmap is not owned by the OpenVG
+    graphics system or \a pixmap is invalid.
+
+    This function is typically used to access the backing store
+    for a pixmap when executing raw OpenVG calls.  It must only
+    be used when a QPainter is active and the OpenVG paint engine
+    is in use by the QPainter.
+
+    \sa {QtOpenVG Module}
+*/
+Q_OPENVG_EXPORT VGImage qPixmapToVGImage(const QPixmap& pixmap)
+{
+    QPixmapData *pd = pixmap.pixmapData();
+    if (pd->classId() == QPixmapData::OpenVGClass) {
+        QVGPixmapData *vgpd = static_cast<QVGPixmapData *>(pd);
+        if (vgpd->isValid())
+            return vgpd->toVGImage();
+    }
+    return VG_INVALID_HANDLE;
+}
+
 QT_END_NAMESPACE
diff --git a/src/qbase.pri b/src/qbase.pri
index 1fb7427..137b933 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -13,7 +13,7 @@ mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm
 #load up the headers info
 CONFIG += qt_install_headers
 HEADERS_PRI = $$QT_BUILD_TREE/include/$$TARGET/headers.pri
-include($$HEADERS_PRI)|clear(HEADERS_PRI)
+include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
 
 #version overriding
 win32 {
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 35ff376..fa17461 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -116,7 +116,7 @@ int QBenchmarkGlobalData::adjustMedianIterationCount()
 QBenchmarkTestMethodData *QBenchmarkTestMethodData::current;
 
 QBenchmarkTestMethodData::QBenchmarkTestMethodData()
-:resultAccepted(false), iterationCount(-1)
+:resultAccepted(false), runOnce(false), iterationCount(-1)
 {
    
 }
@@ -157,6 +157,11 @@ void QBenchmarkTestMethodData::setResult(qint64 value)
     if (QBenchmarkGlobalData::current->iterationCount != -1)
         accepted = true;
 
+    if (QBenchmarkTestMethodData::current->runOnce) {
+        iterationCount = 1;
+        accepted = true;
+    }
+    
     // Test the result directly without calling the measurer if the minimum time 
     // has been specifed on the command line with -minimumvalue.
     else if (QBenchmarkGlobalData::current->walltimeMinimum != -1)
@@ -179,10 +184,12 @@ void QBenchmarkTestMethodData::setResult(qint64 value)
     drive the benchmarking loop. It is repsonsible for starting and stopping
     the timing measurements as well as calling the result reporting functions.
 */
-QTest::QBenchmarkIterationController::QBenchmarkIterationController()
+QTest::QBenchmarkIterationController::QBenchmarkIterationController(RunMode runMode)
 {
     QTest::beginBenchmarkMeasurement();
     i = 0;
+    if (runMode == RunOnce)
+        QBenchmarkTestMethodData::current->runOnce = true;    
 }
 /*! \internal
 */
@@ -195,6 +202,8 @@ QTest::QBenchmarkIterationController::~QBenchmarkIterationController()
 */
 bool QTest::QBenchmarkIterationController::isDone()
 {
+    if (QBenchmarkTestMethodData::current->runOnce)
+        return i > 0;
     return i >= QTest::iterationCount();
 }
 
diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h
index c06bfc0..87d34e7 100644
--- a/src/testlib/qbenchmark.h
+++ b/src/testlib/qbenchmark.h
@@ -64,7 +64,8 @@ namespace QTest
 class Q_TESTLIB_EXPORT QBenchmarkIterationController
 {
 public:
-    QBenchmarkIterationController();
+    enum RunMode { RepeatUntilValidMeasurement, RunOnce };
+    QBenchmarkIterationController(RunMode runMode);
     ~QBenchmarkIterationController();
     bool isDone();
     void next();
@@ -74,7 +75,12 @@ public:
 }
 
 #define QBENCHMARK \
-    for (QTest::QBenchmarkIterationController __iteration_controller; __iteration_controller.isDone() == false; __iteration_controller.next())
+    for (QTest::QBenchmarkIterationController __iteration_controller(QTest::QBenchmarkIterationController::RepeatUntilValidMeasurement); \
+            __iteration_controller.isDone() == false; __iteration_controller.next())
+
+#define QBENCHMARK_ONCE \
+    for (QTest::QBenchmarkIterationController __iteration_controller(QTest::QBenchmarkIterationController::RunOnce); \
+            __iteration_controller.isDone() == false; __iteration_controller.next())
 
 QT_END_NAMESPACE
 
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
index 25f9cdc..185d656 100644
--- a/src/testlib/qbenchmark_p.h
+++ b/src/testlib/qbenchmark_p.h
@@ -171,6 +171,7 @@ public:
 
     QBenchmarkResult result;
     bool resultAccepted;
+    bool runOnce;
     int iterationCount;
 };
 
diff --git a/src/testlib/qtestbasicstreamer.h b/src/testlib/qtestbasicstreamer.h
index cabbf34..932f5c3 100644
--- a/src/testlib/qtestbasicstreamer.h
+++ b/src/testlib/qtestbasicstreamer.h
@@ -53,7 +53,7 @@ QT_MODULE(Test)
 class QTestElement;
 class QTestElementAttribute;
 class QTestLogger;
-class QTestCharBuffer;
+struct QTestCharBuffer;
 
 class QTestBasicStreamer
 {
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 65a6e89..3e162bc 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -356,6 +356,25 @@ QT_BEGIN_NAMESPACE
         {Chapter 5: Writing a Benchmark}{Writing a Benchmark}
 */
 
+/*!
+    \macro QBENCHMARK_ONCE
+
+    \relates QTest
+
+    This macro is used to measure the performance of code within a test.
+    The code to be benchmarked is contained within a code block following
+    this macro.
+
+    Unlike QBENCHMARK, the contents of the contained code block is only run
+    once. The elapsed time will be reported as "0" if it's to short to 
+    be measured by the selected backend. (Use)
+ 
+    \sa {QTestLib Manual#Creating a Benchmark}{Creating a Benchmark},
+    {Chapter 5: Writing a Benchmark}{Writing a Benchmark}
+*/
+
+
+
 /*! \enum QTest::SkipMode
 
     This enum describes the modes for skipping tests during execution
diff --git a/src/xmlpatterns/query.pri b/src/xmlpatterns/query.pri
index e09a618..fab1940 100644
--- a/src/xmlpatterns/query.pri
+++ b/src/xmlpatterns/query.pri
@@ -11,4 +11,4 @@ include($$PWD/parser/parser.pri)
 include($$PWD/projection/projection.pri)
 include($$PWD/type/type.pri)
 include($$PWD/utils/utils.pri)
-include($$PWD/qobjectmodel/qobjectmodel.pri)
+include($$PWD/qobjectmodel/qobjectmodel.pri, "", true)
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
index fb6aa1a..bb8e452 100644
--- a/src/xmlpatterns/xmlpatterns.pro
+++ b/src/xmlpatterns/xmlpatterns.pro
@@ -22,10 +22,9 @@ include($$PWD/janitors/janitors.pri)
 include($$PWD/parser/parser.pri)
 include($$PWD/projection/projection.pri)
 include($$PWD/schema/schema.pri)
-include($$PWD/schematron/schematron.pri)
 include($$PWD/type/type.pri)
 include($$PWD/utils/utils.pri)
-include($$PWD/qobjectmodel/qobjectmodel.pri)
+include($$PWD/qobjectmodel/qobjectmodel.pri, "", true)
 
 wince*: {
    # The Microsoft MIPS compiler crashes if /Og is specified