summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf4
-rw-r--r--dependencies.yaml4
-rw-r--r--src/controls/Private/qquickcontrolsprivate_p.h2
-rw-r--r--src/controls/Private/qquicksceneposlistener_p.h2
-rw-r--r--src/controls/plugin.cpp1
-rw-r--r--src/controls/qquickaction_p.h2
-rw-r--r--src/controls/qquickmenu_p.h3
-rw-r--r--src/controls/qquickmenubar_p.h2
-rw-r--r--src/controls/qquickmenuitem_p.h5
-rw-r--r--src/dialogs/qquickcolordialog_p.h2
-rw-r--r--src/dialogs/qquickdialog_p.h2
-rw-r--r--src/dialogs/qquickfiledialog_p.h2
-rw-r--r--src/dialogs/qquickfontdialog_p.h2
-rw-r--r--src/dialogs/qquickmessagedialog_p.h2
-rw-r--r--src/extras/Styles/Flat/qquicktexthandle.cpp2
-rw-r--r--tests/auto/controls/data/tst_combobox.qml6
-rw-r--r--tests/auto/controls/data/tst_textfield.qml2
17 files changed, 39 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 1ee23b1b..ba3d879b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,6 +2,6 @@ load(qt_build_config)
CONFIG += warning_clean
android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop
-DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
+DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
diff --git a/dependencies.yaml b/dependencies.yaml
new file mode 100644
index 00000000..a9641a24
--- /dev/null
+++ b/dependencies.yaml
@@ -0,0 +1,4 @@
+dependencies:
+ ../qtgraphicaleffects:
+ ref: 0e5719d4cd3b0dddeee8dae06d158f534293bd89
+ required: false
diff --git a/src/controls/Private/qquickcontrolsprivate_p.h b/src/controls/Private/qquickcontrolsprivate_p.h
index 4302f80a..c4c41507 100644
--- a/src/controls/Private/qquickcontrolsprivate_p.h
+++ b/src/controls/Private/qquickcontrolsprivate_p.h
@@ -53,6 +53,8 @@ class QQuickControlsPrivate1Attached : public QObject
Q_OBJECT
Q_PROPERTY(QQuickWindow* window READ window NOTIFY windowChanged)
+ Q_MOC_INCLUDE(<QtQuick/qquickwindow.h>)
+
public:
QQuickControlsPrivate1Attached(QObject* attachee);
diff --git a/src/controls/Private/qquicksceneposlistener_p.h b/src/controls/Private/qquicksceneposlistener_p.h
index 61447c7d..f2c1e967 100644
--- a/src/controls/Private/qquicksceneposlistener_p.h
+++ b/src/controls/Private/qquicksceneposlistener_p.h
@@ -56,6 +56,8 @@ class QQuickScenePosListener1 : public QObject, public QQuickItemChangeListener
Q_PROPERTY(QPointF scenePos READ scenePos NOTIFY scenePosChanged FINAL)
Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL)
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
public:
explicit QQuickScenePosListener1(QObject *parent = 0);
~QQuickScenePosListener1();
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 446357aa..529fb96d 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -65,6 +65,7 @@
#include "Private/qquickstyleitem_p.h"
#endif
+#include <QtCore/qfile.h>
#ifndef QT_NO_TRANSLATION
#include <QtCore/qcoreapplication.h>
#include <QtCore/qlibraryinfo.h>
diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h
index 97601a32..8d6757b5 100644
--- a/src/controls/qquickaction_p.h
+++ b/src/controls/qquickaction_p.h
@@ -69,6 +69,8 @@ class QQuickAction1 : public QObject
Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)
#endif
+ Q_MOC_INCLUDE("qquickexclusivegroup_p.h")
+
public:
explicit QQuickAction1(QObject *parent = 0);
~QQuickAction1();
diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h
index 0594f391..762774a7 100644
--- a/src/controls/qquickmenu_p.h
+++ b/src/controls/qquickmenu_p.h
@@ -77,6 +77,9 @@ class QQuickMenu1 : public QQuickMenuText1
Q_PROPERTY(bool __isProxy READ isProxy WRITE setProxy NOTIFY __proxyChanged)
Q_ENUMS(MenuType)
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+ Q_MOC_INCLUDE("qquickaction_p.h")
+
public:
// MenuType must stay in sync with QPlatformMenu::MenuType
enum MenuType { DefaultMenu = 0, EditMenu };
diff --git a/src/controls/qquickmenubar_p.h b/src/controls/qquickmenubar_p.h
index e6dc9647..d2e44435 100644
--- a/src/controls/qquickmenubar_p.h
+++ b/src/controls/qquickmenubar_p.h
@@ -61,6 +61,8 @@ class QQuickMenuBar1: public QObject
Q_PROPERTY(QQuickWindow *__parentWindow READ parentWindow WRITE setParentWindow)
Q_PROPERTY(bool __isNative READ isNative WRITE setNative NOTIFY nativeChanged)
+ Q_MOC_INCLUDE(<QtQuick/qquickwindow.h>)
+
Q_SIGNALS:
void menusChanged();
void nativeChanged();
diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h
index ae7ed0e6..f28fafd9 100644
--- a/src/controls/qquickmenuitem_p.h
+++ b/src/controls/qquickmenuitem_p.h
@@ -81,6 +81,8 @@ class QQuickMenuBase1: public QObject
Q_PROPERTY(bool __isNative READ isNative CONSTANT)
Q_PROPERTY(QQuickItem *__visualItem READ visualItem WRITE setVisualItem)
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
Q_SIGNALS:
void visibleChanged();
@@ -180,6 +182,9 @@ class QQuickMenuItem1 : public QQuickMenuText1
Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)
Q_PROPERTY(QQuickAction1 *action READ boundAction WRITE setBoundAction NOTIFY actionChanged)
+ Q_MOC_INCLUDE("qquickexclusivegroup_p.h")
+ Q_MOC_INCLUDE("qquickaction_p.h")
+
public Q_SLOTS:
void trigger();
diff --git a/src/dialogs/qquickcolordialog_p.h b/src/dialogs/qquickcolordialog_p.h
index 619b7b10..2e252b39 100644
--- a/src/dialogs/qquickcolordialog_p.h
+++ b/src/dialogs/qquickcolordialog_p.h
@@ -61,6 +61,8 @@ class QQuickColorDialog : public QQuickAbstractColorDialog
Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
Q_CLASSINFO("DefaultProperty", "contentItem") // AbstractColorDialog in QML can have only one child
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
public:
explicit QQuickColorDialog(QObject *parent = 0);
~QQuickColorDialog();
diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h
index fec4ec9a..53a8707b 100644
--- a/src/dialogs/qquickdialog_p.h
+++ b/src/dialogs/qquickdialog_p.h
@@ -69,6 +69,8 @@ class QQuickDialog1 : public QQuickAbstractDialog
Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
Q_CLASSINFO("DefaultProperty", "contentItem") // Dialog in QML can have only one child
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
public:
explicit QQuickDialog1(QObject *parent = 0);
~QQuickDialog1();
diff --git a/src/dialogs/qquickfiledialog_p.h b/src/dialogs/qquickfiledialog_p.h
index ae608d75..0bf45592 100644
--- a/src/dialogs/qquickfiledialog_p.h
+++ b/src/dialogs/qquickfiledialog_p.h
@@ -61,6 +61,8 @@ class QQuickFileDialog : public QQuickAbstractFileDialog
Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
Q_CLASSINFO("DefaultProperty", "contentItem") // AbstractFileDialog in QML can have only one child
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
public:
explicit QQuickFileDialog(QObject *parent = 0);
~QQuickFileDialog();
diff --git a/src/dialogs/qquickfontdialog_p.h b/src/dialogs/qquickfontdialog_p.h
index bd04f536..3c2089d6 100644
--- a/src/dialogs/qquickfontdialog_p.h
+++ b/src/dialogs/qquickfontdialog_p.h
@@ -61,6 +61,8 @@ class QQuickFontDialog : public QQuickAbstractFontDialog
Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
Q_CLASSINFO("DefaultProperty", "contentItem")
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
public:
explicit QQuickFontDialog(QObject *parent = 0);
~QQuickFontDialog();
diff --git a/src/dialogs/qquickmessagedialog_p.h b/src/dialogs/qquickmessagedialog_p.h
index 3b79f967..c4af85be 100644
--- a/src/dialogs/qquickmessagedialog_p.h
+++ b/src/dialogs/qquickmessagedialog_p.h
@@ -61,6 +61,8 @@ class QQuickMessageDialog : public QQuickAbstractMessageDialog
Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem DESIGNABLE false)
Q_CLASSINFO("DefaultProperty", "contentItem") // AbstractMessageDialog in QML can have only one child
+ Q_MOC_INCLUDE(<QtQuick/qquickitem.h>)
+
public:
explicit QQuickMessageDialog(QObject *parent = 0);
~QQuickMessageDialog();
diff --git a/src/extras/Styles/Flat/qquicktexthandle.cpp b/src/extras/Styles/Flat/qquicktexthandle.cpp
index 48a73b18..41854292 100644
--- a/src/extras/Styles/Flat/qquicktexthandle.cpp
+++ b/src/extras/Styles/Flat/qquicktexthandle.cpp
@@ -42,6 +42,8 @@
#include <QPainterPath>
+#include <QtGui/qpainterpath.h>
+
QQuickTextHandle::QQuickTextHandle(QQuickItem *parent) :
QQuickPaintedItem(parent)
{
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index bccac8d2..01ebbf79 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -155,12 +155,12 @@ TestCase {
}
function test_validator() {
- var comboBox = Qt.createQmlObject('import QtQuick 2.2; \
+ var comboBox = Qt.createQmlObject('import QtQuick 2.14; \
import QtQuick.Controls 1.2; \
ComboBox { \
editable: true; \
- validator: RegExpValidator { \
- regExp: /(red|blue|green)?/ \
+ validator: RegularExpressionValidator { \
+ regularExpression: /(red|blue|green)?/ \
}}', testCase, '')
comboBox.editText = "blu"
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 64b3fad0..111d01b4 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -141,7 +141,7 @@ TestCase {
}
function test_validator() {
- var textfield = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
+ var textfield = Qt.createQmlObject('import QtQuick 2.14; import QtQuick.Controls 1.2; TextField {validator: RegularExpressionValidator { regularExpression: /(red|blue|green)?/; }}', testCase, '')
textfield.text = "blu"
compare(textfield.acceptableInput, false)
View Lorry Controller Status