diff options
27 files changed, 343 insertions, 130 deletions
diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp index df67c04654..ed2f58e7c1 100644 --- a/src/imports/settings/qqmlsettings.cpp +++ b/src/imports/settings/qqmlsettings.cpp @@ -39,6 +39,7 @@ #include "qqmlsettings_p.h" #include <qcoreevent.h> +#include <qloggingcategory.h> #include <qsettings.h> #include <qpointer.h> #include <qjsvalue.h> @@ -222,7 +223,7 @@ QT_BEGIN_NAMESPACE \sa QSettings */ -// #define SETTINGS_DEBUG +Q_LOGGING_CATEGORY(lcSettings, "qt.labs.settings") static const int settingsWriteDelay = 500; @@ -273,9 +274,7 @@ QSettings *QQmlSettingsPrivate::instance() const void QQmlSettingsPrivate::init() { if (!initialized) { -#ifdef SETTINGS_DEBUG - qDebug() << "QQmlSettings: stored at" << instance()->fileName(); -#endif + qCDebug(lcSettings) << "QQmlSettings: stored at" << instance()->fileName(); load(); initialized = true; } @@ -303,9 +302,7 @@ void QQmlSettingsPrivate::load() if (!currentValue.isNull() && (!previousValue.isValid() || (currentValue.canConvert(previousValue.type()) && previousValue != currentValue))) { property.write(q, currentValue); -#ifdef SETTINGS_DEBUG - qDebug() << "QQmlSettings: load" << property.name() << "setting:" << currentValue << "default:" << previousValue; -#endif + qCDebug(lcSettings) << "QQmlSettings: load" << property.name() << "setting:" << currentValue << "default:" << previousValue; } // ensure that a non-existent setting gets written @@ -326,9 +323,7 @@ void QQmlSettingsPrivate::store() QHash<const char *, QVariant>::const_iterator it = changedProperties.constBegin(); while (it != changedProperties.constEnd()) { instance()->setValue(it.key(), it.value()); -#ifdef SETTINGS_DEBUG - qDebug() << "QQmlSettings: store" << it.key() << ":" << it.value(); -#endif + qCDebug(lcSettings) << "QQmlSettings: store" << it.key() << ":" << it.value(); ++it; } changedProperties.clear(); @@ -344,9 +339,7 @@ void QQmlSettingsPrivate::_q_propertyChanged() const QMetaProperty &property = mo->property(i); const QVariant value = readProperty(property); changedProperties.insert(property.name(), value); -#ifdef SETTINGS_DEBUG - qDebug() << "QQmlSettings: cache" << property.name() << ":" << value; -#endif + qCDebug(lcSettings) << "QQmlSettings: cache" << property.name() << ":" << value; } if (timerId != 0) q->killTimer(timerId); diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 7ff51bb6d6..9a279a3327 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -1321,15 +1321,27 @@ Item { if (ddy < (util.dragThreshold + 1)) ddy = 0 + var originalX = item.x; + var originalY = item.y; + mousePress(item, x, y, button, modifiers, delay) - //trigger dragging - mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, moveDelay, button) + + // trigger dragging, this doesn't actually move the item yet + var triggerDragXPos = x + Math.min(util.dragThreshold + 1, dx); + var triggerDragYPos = y + Math.min(util.dragThreshold + 1, dy); + mouseMove(item, triggerDragXPos, triggerDragYPos, moveDelay, button) + if (ddx > 0 || ddy > 0) { - mouseMove(item, x + ddx, y + ddy, moveDelay, button) - mouseMove(item, x + 2*ddx, y + 2*ddy, moveDelay, button) + // move the item by ddx, ddy + mouseMove(item, triggerDragXPos + ddx, triggerDragYPos + ddy, moveDelay, button) + + // move the item by ddx, ddy again + // need to account for whether the previous move actually moved the item or not + mouseMove(item, triggerDragXPos + 2*ddx - (item.x - originalX), triggerDragYPos + 2*ddy - (item.y - originalY), moveDelay, button) } - mouseMove(item, x + dx, y + dy, moveDelay, button) - mouseRelease(item, x + dx, y + dy, button, modifiers, delay) + // Release, causes a final move + // need to account for whether the previous moves actually moved the item or not + mouseRelease(item, x + dx - (item.x - originalX), y + dy - (item.y - originalY), button, modifiers, delay) } /*! diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp index dc7b917bc4..09b7c95eef 100644 --- a/src/qmltest/quicktestevent.cpp +++ b/src/qmltest/quicktestevent.cpp @@ -39,6 +39,7 @@ #include "quicktestevent_p.h" #include <QtTest/qtestkeyboard.h> +#include <QtTest/qtestmouse.h> #include <QtQml/qqml.h> #include <QtQuick/qquickitem.h> #include <QtQuick/qquickwindow.h> @@ -125,8 +126,6 @@ namespace QtQuickTest { enum MouseAction { MousePress, MouseRelease, MouseClick, MouseDoubleClick, MouseMove, MouseDoubleClickSequence }; - int lastMouseTimestamp = 0; - static void mouseEvent(MouseAction action, QWindow *window, QObject *item, Qt::MouseButton button, Qt::KeyboardModifiers stateKey, const QPointF &_pos, int delay=-1) @@ -138,7 +137,7 @@ namespace QtQuickTest delay = QTest::defaultMouseDelay(); if (delay > 0) { QTest::qWait(delay); - lastMouseTimestamp += delay; + QTest::lastMouseTimestamp += delay; } if (action == MouseClick) { @@ -156,7 +155,7 @@ namespace QtQuickTest return; } - QPoint pos; + QPoint pos = _pos.toPoint(); QQuickItem *sgitem = qobject_cast<QQuickItem *>(item); if (sgitem) pos = sgitem->mapToScene(_pos).toPoint(); @@ -165,37 +164,32 @@ namespace QtQuickTest stateKey &= static_cast<unsigned int>(Qt::KeyboardModifierMask); - QMouseEvent me(QEvent::User, QPoint(), Qt::LeftButton, button, stateKey); + if (action == MouseDoubleClick) { + // the QWindow variant of QTest::mouseEvent doesn't have MouseDoubleClick as event + // its MouseDClick is actually like the MouseDoubleClickSequence here + QMouseEvent me(QEvent::MouseButtonDblClick, pos, window->mapToGlobal(pos), button, button, stateKey); + me.setTimestamp(++QTest::lastMouseTimestamp); + QSpontaneKeyEvent::setSpontaneous(&me); + if (!qApp->notify(window, &me)) { + QWARN("Mouse event \"MouseDoubleClick\" not accepted by receiving window"); + } + return; + } + switch (action) { case MousePress: - me = QMouseEvent(QEvent::MouseButtonPress, pos, window->mapToGlobal(pos), button, button, stateKey); - me.setTimestamp(++lastMouseTimestamp); + QTest::mousePress(window, button, stateKey, pos, /*delay*/ 0); break; case MouseRelease: - me = QMouseEvent(QEvent::MouseButtonRelease, pos, window->mapToGlobal(pos), button, 0, stateKey); - me.setTimestamp(++lastMouseTimestamp); - lastMouseTimestamp += 500; // avoid double clicks being generated - break; - case MouseDoubleClick: - me = QMouseEvent(QEvent::MouseButtonDblClick, pos, window->mapToGlobal(pos), button, button, stateKey); - me.setTimestamp(++lastMouseTimestamp); + QTest::mouseRelease(window, button, stateKey, pos, /*delay*/ 0); break; case MouseMove: - // with move event the button is NoButton, but 'buttons' holds the currently pressed buttons - me = QMouseEvent(QEvent::MouseMove, pos, window->mapToGlobal(pos), Qt::NoButton, button, stateKey); - me.setTimestamp(++lastMouseTimestamp); + QTest::mouseMove(window, pos, /*delay*/ 0); break; default: QTEST_ASSERT(false); } - QSpontaneKeyEvent::setSpontaneous(&me); - if (!qApp->notify(window, &me)) { - static const char *mouseActionNames[] = - { "MousePress", "MouseRelease", "MouseClick", "MouseDoubleClick", "MouseMove", "MouseDoubleClickSequence" }; - QString warning = QString::fromLatin1("Mouse event \"%1\" not accepted by receiving window"); - QWARN(warning.arg(QString::fromLatin1(mouseActionNames[static_cast<int>(action)])).toLatin1().data()); - } } #if QT_CONFIG(wheelevent) diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index 7c7bdbc137..0c2e2bc73d 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -171,6 +171,7 @@ available when you import \c QtQuick. \li \l real \c font.letterSpacing \li \l real \c font.wordSpacing \li \l bool \c font.kerning + \li \l bool \c font.preferShaping \li \l enumeration \c font.hintingPreference \endlist diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp index 04c69e9c06..8b6519b4ba 100644 --- a/src/quick/handlers/qquicktaphandler.cpp +++ b/src/quick/handlers/qquicktaphandler.cpp @@ -287,7 +287,7 @@ void QQuickTapHandler::setPressed(bool press, bool cancel, QQuickEventPoint *poi else m_tapCount = 1; qCDebug(lcTapHandler) << objectName() << "tapped" << m_tapCount << "times"; - emit tapped(point); + emit tapped(); emit tapCountChanged(); m_lastTapTimestamp = ts; m_lastTapPos = point->scenePos(); diff --git a/src/quick/handlers/qquicktaphandler_p.h b/src/quick/handlers/qquicktaphandler_p.h index 0e9a6f0411..433d2138ea 100644 --- a/src/quick/handlers/qquicktaphandler_p.h +++ b/src/quick/handlers/qquicktaphandler_p.h @@ -95,7 +95,7 @@ Q_SIGNALS: void timeHeldChanged(); void longPressThresholdChanged(); void gesturePolicyChanged(); - void tapped(QQuickEventPoint *point); + void tapped(); void longPressed(); protected: diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 3b30dfacb9..84e3265ee4 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -5029,22 +5029,31 @@ void QQuickItemPrivate::transformChanged() #endif } +bool QQuickItemPrivate::filterKeyEvent(QKeyEvent *e, bool post) +{ + if (!extra.isAllocated() || !extra->keyHandler) + return false; + + if (post) + e->accept(); + + if (e->type() == QEvent::KeyPress) + extra->keyHandler->keyPressed(e, post); + else + extra->keyHandler->keyReleased(e, post); + + return e->isAccepted(); +} + void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e) { Q_Q(QQuickItem); Q_ASSERT(e->isAccepted()); - if (extra.isAllocated() && extra->keyHandler) { - if (e->type() == QEvent::KeyPress) - extra->keyHandler->keyPressed(e, false); - else - extra->keyHandler->keyReleased(e, false); - - if (e->isAccepted()) - return; - else - e->accept(); - } + if (filterKeyEvent(e, false)) + return; + else + e->accept(); if (e->type() == QEvent::KeyPress) q->keyPressEvent(e); @@ -5054,16 +5063,7 @@ void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e) if (e->isAccepted()) return; - if (extra.isAllocated() && extra->keyHandler) { - e->accept(); - - if (e->type() == QEvent::KeyPress) - extra->keyHandler->keyPressed(e, true); - else - extra->keyHandler->keyReleased(e, true); - } - - if (e->isAccepted() || !q->window()) + if (filterKeyEvent(e, true) || !q->window()) return; //only care about KeyPress now diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index d1aaf6026b..446a7d0945 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -564,6 +564,7 @@ public: virtual void transformChanged(); void deliverKeyEvent(QKeyEvent *); + bool filterKeyEvent(QKeyEvent *, bool post); #if QT_CONFIG(im) void deliverInputMethodEvent(QInputMethodEvent *); #endif diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index e6321e9365..1406e5b547 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -397,6 +397,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) #endif qmlRegisterType<QQuickFlickable, 10>(uri, 2, 10, "Flickable"); + qmlRegisterType<QQuickTextEdit, 10>(uri, 2, 10, "TextEdit"); + qmlRegisterType<QQuickText, 10>(uri, 2, 10, "Text"); } static void initResources() diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 07cc1ff76e..5f58f0cdde 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1515,6 +1515,23 @@ QQuickText::~QQuickText() Text { text: "OATS FLAVOUR WAY"; font.kerning: false } \endqml */ + +/*! + \qmlproperty bool QtQuick::Text::font.preferShaping + \since 5.10 + + Sometimes, a font will apply complex rules to a set of characters in order to + display them correctly. In some writing systems, such as Brahmic scripts, this is + required in order for the text to be legible, but in e.g. Latin script, it is merely + a cosmetic feature. Setting the \c preferShaping property to false will disable all + such features when they are not required, which will improve performance in most cases. + + The default value is true. + + \qml + Text { text: "Some text"; font.preferShaping: false } + \endqml +*/ QFont QQuickText::font() const { Q_D(const QQuickText); diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 6190448479..da11913bde 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -368,6 +368,23 @@ QString QQuickTextEdit::text() const */ /*! + \qmlproperty bool QtQuick::TextEdit::font.preferShaping + \since 5.10 + + Sometimes, a font will apply complex rules to a set of characters in order to + display them correctly. In some writing systems, such as Brahmic scripts, this is + required in order for the text to be legible, but in e.g. Latin script, it is merely + a cosmetic feature. Setting the \c preferShaping property to false will disable all + such features when they are not required, which will improve performance in most cases. + + The default value is true. + + \qml + TextEdit { text: "Some text"; font.preferShaping: false } + \endqml +*/ + +/*! \qmlproperty string QtQuick::TextEdit::text The text to display. If the text format is AutoText the text edit will diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index d01d604171..d516b6f30c 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -392,6 +392,23 @@ QString QQuickTextInputPrivate::realText() const TextInput { text: "OATS FLAVOUR WAY"; font.kerning: false } \endqml */ + +/*! + \qmlproperty bool QtQuick::TextInput::font.preferShaping + \since 5.10 + + Sometimes, a font will apply complex rules to a set of characters in order to + display them correctly. In some writing systems, such as Brahmic scripts, this is + required in order for the text to be legible, but in e.g. Latin script, it is merely + a cosmetic feature. Setting the \c preferShaping property to false will disable all + such features when they are not required, which will improve performance in most cases. + + The default value is true. + + \qml + TextInput { text: "Some text"; font.preferShaping: false } + \endqml +*/ QFont QQuickTextInput::font() const { Q_D(const QQuickTextInput); diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index cf64a94631..7073c711ee 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1678,8 +1678,9 @@ void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEven // if the grabber is an Item: // if the update consists of changing button state, don't accept it unless // the button is one in which the grabber is interested - if (pointerEvent->button() != Qt::NoButton && grabber->acceptedMouseButtons() - && !(grabber->acceptedMouseButtons() & pointerEvent->button())) { + Qt::MouseButtons acceptedButtons = grabber->acceptedMouseButtons(); + if (pointerEvent->button() != Qt::NoButton && acceptedButtons + && !(acceptedButtons & pointerEvent->button())) { pointerEvent->setAccepted(false); return; } diff --git a/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp b/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp index 1b8882e9a5..bb8fce046d 100644 --- a/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp +++ b/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp @@ -75,35 +75,35 @@ static unsigned int typeMap[5] = { GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 }; -EtcTexture::EtcTexture() +QEtcTexture::QEtcTexture() : m_texture_id(0), m_uploaded(false) { initializeOpenGLFunctions(); } -EtcTexture::~EtcTexture() +QEtcTexture::~QEtcTexture() { if (m_texture_id) glDeleteTextures(1, &m_texture_id); } -int EtcTexture::textureId() const +int QEtcTexture::textureId() const { if (m_texture_id == 0) { - EtcTexture *texture = const_cast<EtcTexture*>(this); + QEtcTexture *texture = const_cast<QEtcTexture*>(this); texture->glGenTextures(1, &texture->m_texture_id); } return m_texture_id; } -bool EtcTexture::hasAlphaChannel() const +bool QEtcTexture::hasAlphaChannel() const { return m_type == GL_COMPRESSED_RGBA8_ETC2_EAC || m_type == GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2; } -void EtcTexture::bind() +void QEtcTexture::bind() { if (m_uploaded && m_texture_id) { glBindTexture(GL_TEXTURE_2D, m_texture_id); @@ -158,7 +158,7 @@ public: int textureByteCount() const { return m_data.size(); } QSGTexture *createTexture(QQuickWindow *) const { - EtcTexture *texture = new EtcTexture; + QEtcTexture *texture = new QEtcTexture; texture->m_data = m_data; texture->m_size = m_size; texture->m_paddedSize = m_paddedSize; diff --git a/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h b/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h index 77097cb80a..eb6b2e46c0 100644 --- a/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h +++ b/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h @@ -66,12 +66,12 @@ public: QQuickTextureFactory *read(QIODevice *device); }; -class EtcTexture : public QSGTexture, protected QOpenGLFunctions +class QEtcTexture : public QSGTexture, protected QOpenGLFunctions { Q_OBJECT public: - EtcTexture(); - ~EtcTexture(); + QEtcTexture(); + ~QEtcTexture(); void bind(); diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 6df23cdff5..14ead56740 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -303,6 +303,7 @@ public: QV4::ScopedValue vwspac(scope, obj->get((s = v4->newString(QStringLiteral("wordSpacing"))))); QV4::ScopedValue vhint(scope, obj->get((s = v4->newString(QStringLiteral("hintingPreference"))))); QV4::ScopedValue vkerning(scope, obj->get((s = v4->newString(QStringLiteral("kerning"))))); + QV4::ScopedValue vshaping(scope, obj->get((s = v4->newString(QStringLiteral("preferShaping"))))); // pull out the values, set ok to true if at least one valid field is given. if (vbold->isBoolean()) { @@ -361,6 +362,13 @@ public: retn.setKerning(vkerning->booleanValue()); if (ok) *ok = true; } + if (vshaping->isBoolean()) { + bool enable = vshaping->booleanValue(); + if (enable) + retn.setStyleStrategy(static_cast<QFont::StyleStrategy>(retn.styleStrategy() & ~QFont::PreferNoShaping)); + else + retn.setStyleStrategy(static_cast<QFont::StyleStrategy>(retn.styleStrategy() | QFont::PreferNoShaping)); + } return retn; } diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp index 15defdc01b..b19eec6fb3 100644 --- a/src/quick/util/qquickpath.cpp +++ b/src/quick/util/qquickpath.cpp @@ -146,6 +146,9 @@ QT_BEGIN_NAMESPACE \li No \endtable + \note Path is a non-visual type; it does not display anything on its own. + To draw a path, use \l Shape. + \sa PathView, Shape, PathAttribute, PathPercent, PathLine, PathMove, PathQuad, PathCubic, PathArc, PathCurve, PathSvg */ QQuickPath::QQuickPath(QObject *parent) diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp index bc4a72b6ea..e4a03f3b52 100644 --- a/src/quick/util/qquickvaluetypes.cpp +++ b/src/quick/util/qquickvaluetypes.cpp @@ -767,6 +767,19 @@ void QQuickFontValueType::setKerning(bool b) v.setKerning(b); } +bool QQuickFontValueType::preferShaping() const +{ + return (v.styleStrategy() & QFont::PreferNoShaping) == 0; +} + +void QQuickFontValueType::setPreferShaping(bool enable) +{ + if (enable) + v.setStyleStrategy(static_cast<QFont::StyleStrategy>(v.styleStrategy() & ~QFont::PreferNoShaping)); + else + v.setStyleStrategy(static_cast<QFont::StyleStrategy>(v.styleStrategy() | QFont::PreferNoShaping)); +} + QT_END_NAMESPACE #include "moc_qquickvaluetypes_p.cpp" diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h index a3f35a84ec..5a9af970e8 100644 --- a/src/quick/util/qquickvaluetypes_p.h +++ b/src/quick/util/qquickvaluetypes_p.h @@ -324,6 +324,7 @@ class QQuickFontValueType Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing FINAL) Q_PROPERTY(HintingPreference hintingPreference READ hintingPreference WRITE setHintingPreference FINAL) Q_PROPERTY(bool kerning READ kerning WRITE setKerning FINAL) + Q_PROPERTY(bool preferShaping READ preferShaping WRITE setPreferShaping FINAL) public: enum FontWeight { Thin = QFont::Thin, @@ -397,6 +398,9 @@ public: bool kerning() const; void setKerning(bool b); + + bool preferShaping() const; + void setPreferShaping(bool b); }; QT_END_NAMESPACE diff --git a/tests/auto/qmltest/events/tst_drag.qml b/tests/auto/qmltest/events/tst_drag.qml index ae77247a41..74affb6287 100644 --- a/tests/auto/qmltest/events/tst_drag.qml +++ b/tests/auto/qmltest/events/tst_drag.qml @@ -72,12 +72,14 @@ Rectangle{ height:100 color: "red" property bool updatePositionWhileDragging: false - property var posX: 0 - property var posY: 0 - - function reset() { - fakeHandle.x = 0 - fakeHandle.y = 0 + property double posX: 0 + property double posY: 0 + + function reset(mouseX, mouseY) { + posX = mouseX; + posY = mouseY; + fakeHandle.x = mouseX; + fakeHandle.y = mouseY; spyX.clear() spyY.clear() } @@ -116,52 +118,56 @@ Rectangle{ TestCase { name:"mouserelease" when:windowShown - function test_mouseDrag() { - mouseDrag(container, 10, 10, util.dragThreshold * 2, util.dragThreshold * 3); - compare(container.x, util.dragThreshold - 1); - compare(container.y, util.dragThreshold * 2 - 1); + + function test_mouseDrag_data() { + return [ + { tag: "short", dx: 20, dy: 30 }, + { tag: "long", dx: 70, dy: 60 }, + { tag: "longshort", dx: 70, dy: 20 }, + { tag: "shortlong", dx: 20, dy: 70 } + ]; + } + + function test_mouseDrag(data) { + container.x = 0; + container.y = 0; + mouseDrag(container, 10, 10, data.dx, data.dy); + compare(container.x, data.dx - util.dragThreshold - 1); + compare(container.y, data.dy - util.dragThreshold - 1); + } + + function test_doSomethingInsteadOfDragging_data() { + return [ + { tag: "short", updatePositionWhileDragging: false, dx: 2*util.dragThreshold, dy: 2*util.dragThreshold }, + { tag: "long", updatePositionWhileDragging: false, dx: 10*util.dragThreshold, dy: 10*util.dragThreshold }, + { tag: "nothing_short", updatePositionWhileDragging: false, dx: 0, dy: 2*util.dragThreshold }, + { tag: "long_nothing", updatePositionWhileDragging: false, dx: 10*util.dragThreshold, dy: 0 }, + { tag: "short_update", updatePositionWhileDragging: true, dx: 2*util.dragThreshold, dy: 2*util.dragThreshold }, + { tag: "long_update", updatePositionWhileDragging: true, dx: 10*util.dragThreshold, dy: 10*util.dragThreshold }, + { tag: "nothing_short_up", updatePositionWhileDragging: true, dx: 0, dy: 2*util.dragThreshold }, + { tag: "long_nothing_up", updatePositionWhileDragging: true, dx: 10*util.dragThreshold, dy: 0 }, + ]; } - function test_doSomethingWhileDragging() { - container2.updatePositionWhileDragging = false - // dx and dy are superior to 3 times util.dragThreshold. - // but here the dragging does not update posX and posY - // posX and posY are only updated on mouseRelease - container2.reset() - mouseDrag(container2, container2.x + 10, container2.y + 10, 10*util.dragThreshold, 10*util.dragThreshold); - compare(spyX.count, 1) - compare(spyY.count, 1) - - container2.updatePositionWhileDragging = true - // dx and dy are superior to 3 times util.dragThreshold. - // 3 intermediate mouseMove when dragging - container2.reset() - mouseDrag(container2, container2.x + 10, container2.y + 10, 10*util.dragThreshold, 10*util.dragThreshold); - compare(spyX.count, 3) - compare(spyY.count, 3) - - // dx and dy are inferior to 3 times util.dragThreshold. - // No intermediate mouseMove when dragging, only one mouseMove - container2.reset() - mouseDrag(container2, container2.x + 10, container2.y + 10, 2*util.dragThreshold, 2*util.dragThreshold); - compare(spyX.count, 1) - compare(spyY.count, 1) - - // dx is superior to 3 times util.dragThreshold. - // 3 intermediate mouseMove when dragging on x axis - // no move on the y axis - container2.reset() - mouseDrag(container2, container2.x + 10, container2.y + 10, 10*util.dragThreshold, 0); - compare(spyX.count, 3) - compare(spyY.count, 0) - - // dy is inferior to 3 times util.dragThreshold. - // No intermediate mouseMove when dragging, only one mouseMove on y axis - // no move on the x axis - container2.reset() - mouseDrag(container2, container2.x + 10, container2.y + 10, 0, 2*util.dragThreshold); - compare(spyX.count, 0) - compare(spyY.count, 1) + function test_doSomethingInsteadOfDragging(data) { + var expectedSpyCountX; + var expectedSpyCountY; + + if (!data.updatePositionWhileDragging) { + expectedSpyCountX = data.dx > util.dragThreshold ? 1 : 0; + expectedSpyCountY = data.dy > util.dragThreshold ? 1 : 0; + } else { + expectedSpyCountX = data.dx > util.dragThreshold * 3 ? 3 : + (data.dx > util.dragThreshold ? 1 : 0); + expectedSpyCountY = data.dy > util.dragThreshold * 3 ? 3 : + (data.dy > util.dragThreshold ? 1 : 0); + } + + container2.updatePositionWhileDragging = data.updatePositionWhileDragging; + container2.reset(container2.x + 10, container2.y + 10); + mouseDrag(container2, container2.x + 10, container2.y + 10, data.dx, data.dy); + compare(spyX.count, expectedSpyCountX) + compare(spyY.count, expectedSpyCountY) } } } diff --git a/tests/auto/qmltest/events/tst_events.qml b/tests/auto/qmltest/events/tst_events.qml index d9868a316c..b3995e99c0 100644 --- a/tests/auto/qmltest/events/tst_events.qml +++ b/tests/auto/qmltest/events/tst_events.qml @@ -59,9 +59,10 @@ Rectangle { Window { id: sub - visible: true + visible: false property bool clicked: false MouseArea { + id: subMouseArea anchors.fill: parent onClicked: sub.clicked = true } @@ -101,6 +102,8 @@ Rectangle { } function test_mouse_click_subwindow() { + sub.visible = true; + waitForRendering(subMouseArea); // Since we don't have a waitForWindowShown mouseClick(sub) tryCompare(sub, "clicked", true, 10000) } diff --git a/tests/auto/quicktest/quicktest.pro b/tests/auto/quicktest/quicktest.pro index 3b4ec23a64..ee22131753 100644 --- a/tests/auto/quicktest/quicktest.pro +++ b/tests/auto/quicktest/quicktest.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS = \ - signalspy + signalspy \ + testevent diff --git a/tests/auto/quicktest/testevent/testevent.pro b/tests/auto/quicktest/testevent/testevent.pro new file mode 100644 index 0000000000..bd97e13b89 --- /dev/null +++ b/tests/auto/quicktest/testevent/testevent.pro @@ -0,0 +1,8 @@ +CONFIG += testcase +TARGET = tst_testevent +macos:CONFIG -= app_bundle + +SOURCES += tst_testevent.cpp +QT += quick testlib qmltest-private + +include (../../shared/util.pri) diff --git a/tests/auto/quicktest/testevent/tst_testevent.cpp b/tests/auto/quicktest/testevent/tst_testevent.cpp new file mode 100644 index 0000000000..8adb98f33b --- /dev/null +++ b/tests/auto/quicktest/testevent/tst_testevent.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qtest.h> + +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickwindow.h> +#include "QtQuickTest/private/quicktestevent_p.h" + +class tst_testevent : public QObject +{ + Q_OBJECT +public: + +private slots: + void moveSetsQuickItemIsUnderMouse(); +}; + +void tst_testevent::moveSetsQuickItemIsUnderMouse() +{ + QQuickWindow w; + w.resize(400, 400); + w.show(); + w.requestActivate(); + QTest::qWaitForWindowActive(&w); + + QTRY_COMPARE(QGuiApplication::focusWindow(), &w); + + QQuickItem *item = new QQuickItem(w.contentItem()); + item->setX(0); + item->setY(0); + item->setWidth(100); + item->setHeight(100); + + QQuickItem *item2 = new QQuickItem(w.contentItem()); + item2->setX(100); + item2->setY(100); + item2->setWidth(100); + item2->setHeight(100); + + QuickTestEvent te; + te.mouseMove(w.contentItem(), 10, 10, /*delay*/ -1, Qt::NoButton); + + QVERIFY(item->isUnderMouse()); + QVERIFY(!item2->isUnderMouse()); + + te.mouseMove(w.contentItem(), 110, 110, /*delay*/ -1, Qt::NoButton); + + QVERIFY(!item->isUnderMouse()); + QVERIFY(item2->isUnderMouse()); + +} + +QTEST_MAIN(tst_testevent) + +#include "tst_testevent.moc" diff --git a/tests/manual/pointer/main.cpp b/tests/manual/pointer/main.cpp index 7935b4072c..5f6af79973 100644 --- a/tests/manual/pointer/main.cpp +++ b/tests/manual/pointer/main.cpp @@ -44,6 +44,7 @@ int main(int argc, char *argv[]) { + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; diff --git a/tests/manual/scenegraph_lancelot/data/text/text_bengali_noshaping.qml b/tests/manual/scenegraph_lancelot/data/text/text_bengali_noshaping.qml new file mode 100644 index 0000000000..343d5768e4 --- /dev/null +++ b/tests/manual/scenegraph_lancelot/data/text/text_bengali_noshaping.qml @@ -0,0 +1,15 @@ +import QtQuick 2.0 + +Item { + width: 320 + height: 480 + + Text { + anchors.fill: parent + wrapMode: Text.WrapAtWordBoundaryOrAnywhere + font.family: "Arial" // Should use Lohit Bengali + font.pixelSize: 20 + font.preferShaping: false + text: "ধারা ১: সমস্ত মানুষ স্বাধীনভাবে সমান মর্যাদা এবং অধিকার নিয়ে জন্মগ্রহণ করে। তাঁদের বিবেক এবং বুদ্ধি আছে; সুতরাং সকলেরই একে অপরের প্রতি ভ্রাতৃত্বসুলভ মনোভাব নিয়ে আচরণ করা উচিৎ।" + } +} diff --git a/tests/manual/scenegraph_lancelot/data/text/text_latin_noshaping.qml b/tests/manual/scenegraph_lancelot/data/text/text_latin_noshaping.qml new file mode 100644 index 0000000000..6dc6c2f3d6 --- /dev/null +++ b/tests/manual/scenegraph_lancelot/data/text/text_latin_noshaping.qml @@ -0,0 +1,15 @@ +import QtQuick 2.0 + +Item { + width: 320 + height: 480 + + Text { + anchors.fill: parent + wrapMode: Text.WrapAtWordBoundaryOrAnywhere + font.family: "Arial" + font.pixelSize: 20 + font.preferShaping: false + text: "Are griffins birds or mammals?" + } +} |