diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/folderlistmodel/fileinfothread.cpp | 5 | ||||
-rw-r--r-- | src/imports/imports.pro | 6 | ||||
-rw-r--r-- | src/imports/localstorage/plugin.cpp | 5 | ||||
-rw-r--r-- | src/imports/qtquick2/plugin.cpp | 6 | ||||
-rw-r--r-- | src/imports/settings/qqmlsettings.cpp | 2 | ||||
-rw-r--r-- | src/imports/testlib/TestCase.qml | 9 |
6 files changed, 15 insertions, 18 deletions
diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp index 5d911eec1e..0b62935f87 100644 --- a/src/imports/folderlistmodel/fileinfothread.cpp +++ b/src/imports/folderlistmodel/fileinfothread.cpp @@ -260,14 +260,13 @@ void FileInfoThread::getFileInfos(const QString &path) sortFlags = sortFlags | QDir::DirsFirst; QDir currentDir(path, QString(), sortFlags); - QFileInfoList fileInfoList; QList<FileProperty> filePropertyList; - fileInfoList = currentDir.entryInfoList(nameFilters, filter, sortFlags); + const QFileInfoList fileInfoList = currentDir.entryInfoList(nameFilters, filter, sortFlags); if (!fileInfoList.isEmpty()) { filePropertyList.reserve(fileInfoList.count()); - foreach (const QFileInfo &info, fileInfoList) { + for (const QFileInfo &info : fileInfoList) { //qDebug() << "Adding file : " << info.fileName() << "to list "; filePropertyList << FileProperty(info); } diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 9e3cdf3f42..affc1db2c0 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -16,10 +16,8 @@ qtHaveModule(quick) { window \ testlib - contains(QT_CONFIG, opengl(es1|es2)?) { - SUBDIRS += \ - particles - } + qtConfig(opengl(es1|es2)?): \ + SUBDIRS += particles } qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index f59ccc551e..7d96f11768 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -149,12 +149,7 @@ public: using namespace QV4; -QT_WARNING_PUSH -#if (Q_CC_GNU >= 600) -QT_WARNING_DISABLE_GCC("-Wtautological-compare") -#endif DEFINE_OBJECT_VTABLE(QV4::QQmlSqlDatabaseWrapper); -QT_WARNING_POP diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index e56027c1bb..d16467a5bb 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -61,13 +61,17 @@ public: { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick")); Q_UNUSED(uri); + moduleDefined = true; QQmlQtQuick2Module::defineModule(); } ~QtQuick2Plugin() { - QQmlQtQuick2Module::undefineModule(); + if (moduleDefined) + QQmlQtQuick2Module::undefineModule(); } + + bool moduleDefined = false; }; //![class decl] diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp index bc097e4575..cd6fcbc718 100644 --- a/src/imports/settings/qqmlsettings.cpp +++ b/src/imports/settings/qqmlsettings.cpp @@ -214,7 +214,7 @@ QT_BEGIN_NAMESPACE instance, even if they are referring to the same setting in the same category. The information is stored in the system registry on Windows, and in XML - preferences files on OS X. On other Unix systems, in the absence of a + preferences files on \macos. On other Unix systems, in the absence of a standard, INI text files are used. See \l QSettings documentation for more details. diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index bc6786f9f8..683200a259 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -1125,6 +1125,7 @@ Item { modifiers = Qt.NoModifier if (delay == undefined) delay = -1 + var moveDelay = Math.max(1, delay === -1 ? qtest_events.defaultMouseDelay : delay) // Divide dx and dy to have intermediate mouseMove while dragging // Fractions of dx/dy need be superior to the dragThreshold @@ -1138,12 +1139,12 @@ Item { mousePress(item, x, y, button, modifiers, delay) //trigger dragging - mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, delay, button) + mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, moveDelay, button) if (ddx > 0 || ddy > 0) { - mouseMove(item, x + ddx, y + ddy, delay, button) - mouseMove(item, x + 2*ddx, y + 2*ddy, delay, button) + mouseMove(item, x + ddx, y + ddy, moveDelay, button) + mouseMove(item, x + 2*ddx, y + 2*ddy, moveDelay, button) } - mouseMove(item, x + dx, y + dy, delay, button) + mouseMove(item, x + dx, y + dy, moveDelay, button) mouseRelease(item, x + dx, y + dy, button, modifiers, delay) } |