aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/folderlistmodel/fileinfothread.cpp1
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.cpp1
-rw-r--r--src/imports/layouts/plugin.cpp11
-rw-r--r--src/imports/layouts/qquicklayout.cpp14
-rw-r--r--src/imports/layouts/qquicklinearlayout.cpp8
-rw-r--r--src/imports/testlib/TestCase.qml24
6 files changed, 47 insertions, 12 deletions
diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp
index 7338636784..5d911eec1e 100644
--- a/src/imports/folderlistmodel/fileinfothread.cpp
+++ b/src/imports/folderlistmodel/fileinfothread.cpp
@@ -66,7 +66,6 @@ FileInfoThread::FileInfoThread(QObject *parent)
connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateFile(QString)));
#endif // !QT_NO_FILESYSTEMWATCHER
- start(LowPriority);
}
FileInfoThread::~FileInfoThread()
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 9b0571a402..66af37c40c 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -538,6 +538,7 @@ void QQuickFolderListModel::componentComplete()
QString localPath = QQmlFile::urlToLocalFileOrQrc(d->currentDir);
if (localPath.isEmpty() || !QDir(localPath).exists())
setFolder(QUrl::fromLocalFile(QDir::currentPath()));
+ d->fileInfoThread.start(QThread::LowPriority);
}
/*!
diff --git a/src/imports/layouts/plugin.cpp b/src/imports/layouts/plugin.cpp
index 4552b7219b..248b12ac31 100644
--- a/src/imports/layouts/plugin.cpp
+++ b/src/imports/layouts/plugin.cpp
@@ -42,6 +42,13 @@
#include "qquicklinearlayout_p.h"
#include "qquickstacklayout_p.h"
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_Layouts);
+#endif
+}
+
QT_BEGIN_NAMESPACE
//![class decl]
@@ -50,6 +57,10 @@ class QtQuickLayoutsPlugin : public QQmlExtensionPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQuickLayoutsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent)
+ {
+ initResources();
+ }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Layouts"));
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
index d4d4e1703d..abc8f97cec 100644
--- a/src/imports/layouts/qquicklayout.cpp
+++ b/src/imports/layouts/qquicklayout.cpp
@@ -40,7 +40,7 @@
#include "qquicklayout_p.h"
#include <QEvent>
#include <QtCore/qcoreapplication.h>
-#include <QtCore/qnumeric.h>
+#include <QtCore/private/qnumeric_p.h>
#include <QtCore/qmath.h>
#include <limits>
@@ -134,7 +134,7 @@ QQuickLayoutAttached::QQuickLayoutAttached(QObject *parent)
*/
void QQuickLayoutAttached::setMinimumWidth(qreal width)
{
- if (qIsNaN(width))
+ if (qt_is_nan(width))
return;
m_isMinimumWidthSet = width >= 0;
if (m_minimumWidth == width)
@@ -162,7 +162,7 @@ void QQuickLayoutAttached::setMinimumWidth(qreal width)
*/
void QQuickLayoutAttached::setMinimumHeight(qreal height)
{
- if (qIsNaN(height))
+ if (qt_is_nan(height))
return;
m_isMinimumHeightSet = height >= 0;
if (m_minimumHeight == height)
@@ -186,7 +186,7 @@ void QQuickLayoutAttached::setMinimumHeight(qreal height)
*/
void QQuickLayoutAttached::setPreferredWidth(qreal width)
{
- if (qIsNaN(width) || m_preferredWidth == width)
+ if (qt_is_nan(width) || m_preferredWidth == width)
return;
m_preferredWidth = width;
@@ -207,7 +207,7 @@ void QQuickLayoutAttached::setPreferredWidth(qreal width)
*/
void QQuickLayoutAttached::setPreferredHeight(qreal height)
{
- if (qIsNaN(height) || m_preferredHeight == height)
+ if (qt_is_nan(height) || m_preferredHeight == height)
return;
m_preferredHeight = height;
@@ -232,7 +232,7 @@ void QQuickLayoutAttached::setPreferredHeight(qreal height)
*/
void QQuickLayoutAttached::setMaximumWidth(qreal width)
{
- if (qIsNaN(width))
+ if (qt_is_nan(width))
return;
m_isMaximumWidthSet = width >= 0;
if (m_maximumWidth == width)
@@ -259,7 +259,7 @@ void QQuickLayoutAttached::setMaximumWidth(qreal width)
*/
void QQuickLayoutAttached::setMaximumHeight(qreal height)
{
- if (qIsNaN(height))
+ if (qt_is_nan(height))
return;
m_isMaximumHeightSet = height >= 0;
if (m_maximumHeight == height)
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp
index 2f8af4c58b..0b4a1968d7 100644
--- a/src/imports/layouts/qquicklinearlayout.cpp
+++ b/src/imports/layouts/qquicklinearlayout.cpp
@@ -40,7 +40,7 @@
#include "qquicklinearlayout_p.h"
#include "qquickgridlayoutengine_p.h"
#include "qquicklayoutstyleinfo_p.h"
-#include <QtCore/qnumeric.h>
+#include <QtCore/private/qnumeric_p.h>
#include "qdebug.h"
#include <limits>
@@ -566,7 +566,7 @@ qreal QQuickGridLayout::columnSpacing() const
void QQuickGridLayout::setColumnSpacing(qreal spacing)
{
Q_D(QQuickGridLayout);
- if (qIsNaN(spacing) || columnSpacing() == spacing)
+ if (qt_is_nan(spacing) || columnSpacing() == spacing)
return;
d->engine.setSpacing(spacing, Qt::Horizontal);
@@ -588,7 +588,7 @@ qreal QQuickGridLayout::rowSpacing() const
void QQuickGridLayout::setRowSpacing(qreal spacing)
{
Q_D(QQuickGridLayout);
- if (qIsNaN(spacing) || rowSpacing() == spacing)
+ if (qt_is_nan(spacing) || rowSpacing() == spacing)
return;
d->engine.setSpacing(spacing, Qt::Vertical);
@@ -867,7 +867,7 @@ qreal QQuickLinearLayout::spacing() const
void QQuickLinearLayout::setSpacing(qreal space)
{
Q_D(QQuickLinearLayout);
- if (qIsNaN(space) || spacing() == space)
+ if (qt_is_nan(space) || spacing() == space)
return;
d->engine.setSpacing(space, Qt::Horizontal | Qt::Vertical);
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 0f73d97c1b..046ce507d4 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -972,6 +972,9 @@ Item {
\sa mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
*/
function mousePress(item, x, y, button, modifiers, delay) {
+ if (!item)
+ qtest_fail("No item given to mousePress", 1)
+
if (button === undefined)
button = Qt.LeftButton
if (modifiers === undefined)
@@ -1003,6 +1006,9 @@ Item {
\sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
*/
function mouseRelease(item, x, y, button, modifiers, delay) {
+ if (!item)
+ qtest_fail("No item given to mouseRelease", 1)
+
if (button === undefined)
button = Qt.LeftButton
if (modifiers === undefined)
@@ -1036,6 +1042,9 @@ Item {
\sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseWheel()
*/
function mouseDrag(item, x, y, dx, dy, button, modifiers, delay) {
+ if (!item)
+ qtest_fail("No item given to mouseDrag", 1)
+
if (item.x === undefined || item.y === undefined)
return
if (button === undefined)
@@ -1083,6 +1092,9 @@ Item {
\sa mousePress(), mouseRelease(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
*/
function mouseClick(item, x, y, button, modifiers, delay) {
+ if (!item)
+ qtest_fail("No item given to mouseClick", 1)
+
if (button === undefined)
button = Qt.LeftButton
if (modifiers === undefined)
@@ -1114,6 +1126,9 @@ Item {
\sa mouseDoubleClickSequence(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel()
*/
function mouseDoubleClick(item, x, y, button, modifiers, delay) {
+ if (!item)
+ qtest_fail("No item given to mouseDoubleClick", 1)
+
if (button === undefined)
button = Qt.LeftButton
if (modifiers === undefined)
@@ -1152,6 +1167,9 @@ Item {
\sa mouseDoubleClick(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel()
*/
function mouseDoubleClickSequence(item, x, y, button, modifiers, delay) {
+ if (!item)
+ qtest_fail("No item given to mouseDoubleClickSequence", 1)
+
if (button === undefined)
button = Qt.LeftButton
if (modifiers === undefined)
@@ -1181,6 +1199,9 @@ Item {
\sa mousePress(), mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseDrag(), mouseWheel()
*/
function mouseMove(item, x, y, delay, buttons) {
+ if (!item)
+ qtest_fail("No item given to mouseMove", 1)
+
if (delay == undefined)
delay = -1
if (buttons == undefined)
@@ -1206,6 +1227,9 @@ Item {
\sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseDrag(), QWheelEvent::angleDelta()
*/
function mouseWheel(item, x, y, xDelta, yDelta, buttons, modifiers, delay) {
+ if (!item)
+ qtest_fail("No item given to mouseWheel", 1)
+
if (delay == undefined)
delay = -1
if (buttons == undefined)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 00:50:40 +0000