summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dist/changes-4.7.112
-rw-r--r--src/activeqt/shared/qaxtypes.cpp6
-rw-r--r--src/gui/kernel/qwidget_x11.cpp4
-rw-r--r--src/script/api/qscriptengine.cpp7
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp60
5 files changed, 81 insertions, 8 deletions
diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 9a3e543..2d79ac1 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -62,6 +62,16 @@ QtGui
- QGraphicsWidget
* [QTBUG-13188] Make sure a font that has propagated from a parent can
be set on a QPainter.
+ * [QT-3808] Issues when applying effects in combination with ItemHasNoContents flag.
+
+ - QGraphicsItem
+ * [QTBUG-3633, QT-3828] Wrong children bounding rect when applying effects.
+
+ - QGraphicsEffect
+ * [QT-3633] Wrong bounding rect.
+
+ - QGraphicsScene
+ * [QT-3674] Spurious assert triggered from render().
- QPainter
* [QTBUG-13429] Fixed scale point drawing with square cap in the raster
@@ -90,6 +100,8 @@ QtGui
- QTreeView
* [QTBUG-13567] Do not scroll to top if last item is removed
+ - QGtkStyle
+ * [QTBUG-13125] Fixed a regression with custom itemview background color.
QtDBus
------
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index 957733e..ff21a9f 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -1376,8 +1376,10 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
}
QVariant::Type proptype = (QVariant::Type)type;
- if (proptype == QVariant::Invalid && !typeName.isEmpty())
- proptype = QVariant::nameToType(typeName);
+ if (proptype == QVariant::Invalid && !typeName.isEmpty()) {
+ if (typeName != "QVariant")
+ proptype = QVariant::nameToType(typeName);
+ }
if (proptype != QVariant::LastType && proptype != QVariant::Invalid && var.type() != proptype) {
if (var.canConvert(proptype)) {
QVariant oldvar = var;
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index e01489f..8d80e10 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -889,8 +889,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
q->setWindowOpacity(maybeTopData()->opacity/255.);
}
- } else if (q->testAttribute(Qt::WA_SetCursor) && q->internalWinId()) {
+ } else if (q->internalWinId()) {
qt_x11_enforce_cursor(q);
+ if (QWidget *p = q->parentWidget()) // reset the cursor on the native parent
+ qt_x11_enforce_cursor(p);
}
if (extra && !extra->mask.isEmpty() && q->internalWinId())
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 07aced4..128e9c3 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -46,6 +46,7 @@
#include "Error.h"
#include "Interpreter.h"
+#include "ExceptionHelpers.h"
#include "PrototypeFunction.h"
#include "InitializeThreading.h"
#include "ObjectPrototype.h"
@@ -4116,9 +4117,11 @@ bool QScriptEngine::isEvaluating() const
void QScriptEngine::abortEvaluation(const QScriptValue &result)
{
Q_D(QScriptEngine);
-
- d->timeoutChecker()->setShouldAbort(true);
+ if (!isEvaluating())
+ return;
d->abortResult = result;
+ d->timeoutChecker()->setShouldAbort(true);
+ JSC::throwError(d->currentFrame, JSC::createInterruptedExecutionException(&d->currentFrame->globalData()).toObject(d->currentFrame));
}
#ifndef QT_NO_QOBJECT
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index f96aea6..26eb1af 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -134,6 +134,7 @@ private slots:
void numberParsing();
void automaticSemicolonInsertion();
void abortEvaluation();
+ void abortEvaluation_QTBUG9433();
void isEvaluating();
void printFunctionWithCustomHandler();
void printThrowsException();
@@ -3007,7 +3008,8 @@ public:
enum AbortionResult {
None = 0,
String = 1,
- Error = 2
+ Error = 2,
+ Number = 3
};
EventReceiver3(QScriptEngine *eng) {
@@ -3027,6 +3029,8 @@ public:
case Error:
engine->abortEvaluation(engine->currentContext()->throwError("AbortedWithError"));
break;
+ case Number:
+ engine->abortEvaluation(QScriptValue(1234));
}
}
return QObject::event(e);
@@ -3059,7 +3063,7 @@ void tst_QScriptEngine::abortEvaluation()
EventReceiver3 receiver(&eng);
eng.setProcessEventsInterval(100);
- for (int x = 0; x < 3; ++x) {
+ for (int x = 0; x < 4; ++x) {
QCoreApplication::postEvent(&receiver, new QEvent(QEvent::Type(QEvent::User+1)));
receiver.resultType = EventReceiver3::AbortionResult(x);
QScriptValue ret = eng.evaluate(QString::fromLatin1("while (1) { }"));
@@ -3068,6 +3072,11 @@ void tst_QScriptEngine::abortEvaluation()
QVERIFY(!eng.hasUncaughtException());
QVERIFY(!ret.isValid());
break;
+ case EventReceiver3::Number:
+ QVERIFY(!eng.hasUncaughtException());
+ QVERIFY(ret.isNumber());
+ QCOMPARE(ret.toInt32(), 1234);
+ break;
case EventReceiver3::String:
QVERIFY(!eng.hasUncaughtException());
QVERIFY(ret.isString());
@@ -3082,7 +3091,7 @@ void tst_QScriptEngine::abortEvaluation()
}
// scripts cannot intercept the abortion with try/catch
- for (int y = 0; y < 3; ++y) {
+ for (int y = 0; y < 4; ++y) {
QCoreApplication::postEvent(&receiver, new QEvent(QEvent::Type(QEvent::User+1)));
receiver.resultType = EventReceiver3::AbortionResult(y);
QScriptValue ret = eng.evaluate(QString::fromLatin1(
@@ -3098,6 +3107,11 @@ void tst_QScriptEngine::abortEvaluation()
QVERIFY(!eng.hasUncaughtException());
QVERIFY(!ret.isValid());
break;
+ case EventReceiver3::Number:
+ QVERIFY(!eng.hasUncaughtException());
+ QVERIFY(ret.isNumber());
+ QCOMPARE(ret.toInt32(), 1234);
+ break;
case EventReceiver3::String:
QVERIFY(!eng.hasUncaughtException());
QVERIFY(ret.isString());
@@ -3118,6 +3132,46 @@ void tst_QScriptEngine::abortEvaluation()
}
}
+class ThreadedEngine : public QThread {
+ Q_OBJECT;
+
+private:
+ QScriptEngine* m_engine;
+protected:
+ void run() {
+ m_engine = new QScriptEngine();
+ m_engine->setGlobalObject(m_engine->newQObject(this));
+ m_engine->evaluate("while(1) { sleep(); }");
+ delete m_engine;
+ }
+
+public slots:
+ void sleep()
+ {
+ QTest::qSleep(25);
+ m_engine->abortEvaluation();
+ }
+};
+
+void tst_QScriptEngine::abortEvaluation_QTBUG9433()
+{
+ ThreadedEngine engine;
+ engine.start();
+ QVERIFY(engine.isRunning());
+ QTest::qSleep(50);
+ for (uint i = 0; i < 50; ++i) { // up to ~2500 ms
+ if (engine.isFinished())
+ return;
+ QTest::qSleep(50);
+ }
+ if (!engine.isFinished()) {
+ engine.terminate();
+ engine.wait(7000);
+ QFAIL("abortEvaluation doesn't work");
+ }
+
+}
+
static QScriptValue myFunctionReturningIsEvaluating(QScriptContext *, QScriptEngine *eng)
{
return QScriptValue(eng, eng->isEvaluating());
generated by cgit v0.12 at 2024-10-24 14:32:01 (GMT)