aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dist/changes-5.0.128
-rw-r--r--src/qml/doc/qtqml.qdocconf2
-rw-r--r--src/qml/qml/qqmltimer_p.h2
-rw-r--r--src/qmltest/quicktest.cpp3
-rw-r--r--src/quick/doc/qtquick.qdocconf2
-rw-r--r--src/quick/items/qquicktextedit_p.h2
-rw-r--r--src/quick/items/qquicktextinput_p.h2
-rw-r--r--src/quick/util/qquickbehavior_p.h2
-rw-r--r--src/quick/util/qquickpropertychanges_p.h2
-rw-r--r--src/quick/util/qquickstategroup_p.h2
-rw-r--r--src/quick/util/qquicktransition_p.h2
-rw-r--r--tests/auto/quick/quick.pro2
12 files changed, 33 insertions, 18 deletions
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
index 9959c36a11..d19b58f0de 100644
--- a/dist/changes-5.0.1
+++ b/dist/changes-5.0.1
@@ -22,35 +22,49 @@ information about a particular change.
General Improvements
--------------------
-Third party components
-----------------------
+ - [QTBUG-23485, QTBUG-28611] Fix tst_qquicktextinput on Windows and Mac.
+ - Documentation for scene graph examples.
+ - Improve example with key navigation.
+ - qmltest: Added the possibility to use QApplication
+ - [QTBUG-28611] Quick tests: Introduce QQmlMessageHandler.
+ - Compile with QT_NO_WHEELEVENT.
****************************************************************************
* Library *
****************************************************************************
-Qt QML
-------
-
-Qt Quick
---------
+ - Don't try to grab Windows with invalid or a zero size
+ - Do not crash on some animation changes
****************************************************************************
* Platform Specific Changes *
****************************************************************************
+Qt for Windows
+--------------
+
+ - [QTBUG-28611] Stabilize QQuickLoader test on Windows.
+ - [QTBUG-28611] Fix tst_qqmlbundle on Windows.
+ - [QTBUG-28611] Fix tst_qqmllanguage for MSVC.
****************************************************************************
* Compiler Specific Changes *
****************************************************************************
+ - Fix other warnings in qtdeclarative found by GCC 4.7
+ - Fix warnings in QtQml due to ?: with enums of different types
+ - Fix compiler warnings in declarative tests.
****************************************************************************
* Tools *
****************************************************************************
+ - Modify qmlscene usage text to be consistent
****************************************************************************
* Plugins *
****************************************************************************
+ - Accessibility: Work with QQuickWindow
+ - Accessibility: Send value updates
+ - Accessibility: Improve interface handling in Quick
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 6cf34ce4e1..5a289767ba 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -8,7 +8,7 @@ version = 5.0.1
qhp.projects = QtQml
qhp.QtQml.file = qtqml.qhp
-qhp.QtQml.namespace = org.qt-project.qtqml.500
+qhp.QtQml.namespace = org.qt-project.qtqml.501
qhp.QtQml.virtualFolder = qtqml
qhp.QtQml.indexTitle = Qt QML
qhp.QtQml.indexRoot =
diff --git a/src/qml/qml/qqmltimer_p.h b/src/qml/qml/qqmltimer_p.h
index ac199e1e42..ff6d6207ff 100644
--- a/src/qml/qml/qqmltimer_p.h
+++ b/src/qml/qml/qqmltimer_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QQmlTimerPrivate;
-class Q_AUTOTEST_EXPORT QQmlTimer : public QObject, public QQmlParserStatus
+class Q_QML_PRIVATE_EXPORT QQmlTimer : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_DECLARE_PRIVATE(QQmlTimer)
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index f1f3c46f2d..1dc0e3fecb 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -339,7 +339,8 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD
view->resize(200, 200);
}
view->show();
- if (qWaitForSignal(view, SIGNAL(frameSwapped())))
+ QTest::qWaitForWindowExposed(view);
+ if (view->isExposed())
rootobj.setWindowShown(true);
if (!rootobj.hasQuit && rootobj.hasTestCase())
eventLoop.exec();
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index f75ae06539..96ee13bb51 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -9,7 +9,7 @@ version = 5.0.1
qhp.projects = QtQuick
qhp.QtQuick.file = qtquick.qhp
-qhp.QtQuick.namespace = org.qt-project.qtquick.500
+qhp.QtQuick.namespace = org.qt-project.qtquick.501
qhp.QtQuick.virtualFolder = qtquick
qhp.QtQuick.indexTitle = Qt Quick
qhp.QtQuick.indexRoot =
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h
index 652b83982d..e88ca16c0e 100644
--- a/src/quick/items/qquicktextedit_p.h
+++ b/src/quick/items/qquicktextedit_p.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QQuickTextEditPrivate;
-class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem
+class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem
{
Q_OBJECT
Q_ENUMS(VAlignment)
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index cad47b576e..83bc125dee 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
class QQuickTextInputPrivate;
class QValidator;
-class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
+class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
{
Q_OBJECT
Q_ENUMS(HAlignment)
diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h
index b13e387c9d..a93b597a6b 100644
--- a/src/quick/util/qquickbehavior_p.h
+++ b/src/quick/util/qquickbehavior_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
class QQuickAbstractAnimation;
class QQuickBehaviorPrivate;
-class Q_AUTOTEST_EXPORT QQuickBehavior : public QObject, public QQmlPropertyValueInterceptor
+class Q_QUICK_PRIVATE_EXPORT QQuickBehavior : public QObject, public QQmlPropertyValueInterceptor
{
Q_OBJECT
Q_DECLARE_PRIVATE(QQuickBehavior)
diff --git a/src/quick/util/qquickpropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h
index 3a4ec6da91..95320afd6d 100644
--- a/src/quick/util/qquickpropertychanges_p.h
+++ b/src/quick/util/qquickpropertychanges_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QQuickPropertyChangesPrivate;
-class Q_AUTOTEST_EXPORT QQuickPropertyChanges : public QQuickStateOperation
+class Q_QUICK_PRIVATE_EXPORT QQuickPropertyChanges : public QQuickStateOperation
{
Q_OBJECT
Q_DECLARE_PRIVATE(QQuickPropertyChanges)
diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h
index dc5e992a19..ccd928aacf 100644
--- a/src/quick/util/qquickstategroup_p.h
+++ b/src/quick/util/qquickstategroup_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QQuickStateGroupPrivate;
-class Q_AUTOTEST_EXPORT QQuickStateGroup : public QObject, public QQmlParserStatus
+class Q_QUICK_PRIVATE_EXPORT QQuickStateGroup : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)
diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h
index ed01413703..6ed2ad63cf 100644
--- a/src/quick/util/qquicktransition_p.h
+++ b/src/quick/util/qquicktransition_p.h
@@ -74,7 +74,7 @@ private:
friend class QQuickTransition;
};
-class Q_AUTOTEST_EXPORT QQuickTransition : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickTransition : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QQuickTransition)
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 9600d0c7cf..3ed6ca8c99 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -7,7 +7,7 @@ PUBLICTESTS += \
qtHaveModule(widgets): PUBLICTESTS += nodes
-!cross_compile: PUBLICTESTS += examples
+!cross_compile: PRIVATETESTS += examples
# This test requires the qtconcurrent module
!qtHaveModule(concurrent): PUBLICTESTS -= qquickpixmapcache
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 10:18:41 +0000