From 201c86391c7ff78d570fdec6e0c0b71eb1e9aae4 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 1 Dec 2016 07:28:23 +0200 Subject: Add changes file for 5.8.0 Change-Id: I63a99f4816101317576164d5c2335ffd9c02a86a Reviewed-by: Shawn Rutledge Reviewed-by: J-P Nurmi --- dist/changes-5.8.0 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 dist/changes-5.8.0 diff --git a/dist/changes-5.8.0 b/dist/changes-5.8.0 new file mode 100644 index 00000000..fb70f771 --- /dev/null +++ b/dist/changes-5.8.0 @@ -0,0 +1,33 @@ +Qt 5.8 introduces many new features and improvements as well as bugfixes +over the 5.7.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.8 series is binary compatible with the 5.7.x series. +Applications compiled for 5.7 will continue to run with 5.8. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Controls * +**************************************************************************** + + - ComboBox: + * [QTBUG-53921] Fixed the current text to update on model changes. + + - TableView: + * [QTBUG-57283] Fixed a possible crash due to out of memory on ARM. + +**************************************************************************** +* Dialogs * +**************************************************************************** + + - FileDialog: + * [QTBUG-56663] Fixed selection handling when the OK button is clicked. -- cgit v1.2.1 From 07490d5610f7a18bbf50f3a5d118c33fb8e88f5d Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Mon, 30 Jan 2017 15:23:26 +0100 Subject: Fix feature dependencies Build with -no-feature-filedialog, -no-feature-messagebox, -no-feature-colordialog, and -no-feature-fontdialog Change-Id: I0d63451a546014400f051645460a1fc1362eb753 Reviewed-by: J-P Nurmi Reviewed-by: Shawn Rutledge --- src/widgets/qquickqfiledialog_p.h | 4 +++ src/widgets/widgets.pro | 60 +++++++++++++++++++++++++++------------ src/widgets/widgetsplugin.cpp | 9 +++++- 3 files changed, 54 insertions(+), 19 deletions(-) diff --git a/src/widgets/qquickqfiledialog_p.h b/src/widgets/qquickqfiledialog_p.h index fef39584..9e20ae88 100644 --- a/src/widgets/qquickqfiledialog_p.h +++ b/src/widgets/qquickqfiledialog_p.h @@ -54,6 +54,8 @@ #include #include "../dialogs/qquickabstractfiledialog_p.h" +#if QT_CONFIG(filedialog) + QT_BEGIN_NAMESPACE class QQuickQFileDialog : public QQuickAbstractFileDialog @@ -104,4 +106,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickQFileDialog *) +#endif // QT_CONFIG(filedialog) + #endif // QQUICKQFILEDIALOG_P_H diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 2e3c8164..04bfd21b 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -5,30 +5,54 @@ TARGET = widgetsplugin TARGETPATH = QtQuick/PrivateWidgets IMPORT_VERSION = 1.1 +QT += quick-private gui-private core-private qml-private widgets + SOURCES += \ - qquickqmessagebox.cpp \ - ../dialogs/qquickabstractmessagedialog.cpp \ - qquickqfiledialog.cpp \ - ../dialogs/qquickabstractfiledialog.cpp \ - qquickqcolordialog.cpp \ - ../dialogs/qquickabstractcolordialog.cpp \ - qquickqfontdialog.cpp \ - ../dialogs/qquickabstractfontdialog.cpp \ ../dialogs/qquickabstractdialog.cpp \ widgetsplugin.cpp HEADERS += \ - qquickqmessagebox_p.h \ - qmessageboxhelper_p.h \ - ../dialogs/qquickabstractmessagedialog_p.h \ - qquickqfiledialog_p.h \ - ../dialogs/qquickabstractfiledialog_p.h \ - qquickqcolordialog_p.h \ - ../dialogs/qquickabstractcolordialog_p.h \ - qquickqfontdialog_p.h \ - ../dialogs/qquickabstractfontdialog_p.h \ ../dialogs/qquickabstractdialog_p.h -QT += quick-private gui-private core-private qml-private widgets +qtConfig(messagebox) { + HEADERS += \ + qquickqmessagebox_p.h \ + qmessageboxhelper_p.h \ + ../dialogs/qquickabstractmessagedialog_p.h + + SOURCES += \ + qquickqmessagebox.cpp \ + ../dialogs/qquickabstractmessagedialog.cpp +} + +qtConfig(filedialog) { + SOURCES += \ + qquickqfiledialog.cpp \ + ../dialogs/qquickabstractfiledialog.cpp + + HEADERS += \ + qquickqfiledialog_p.h \ + ../dialogs/qquickabstractfiledialog_p.h +} + +qtConfig(colordialog) { + SOURCES += \ + qquickqcolordialog.cpp \ + ../dialogs/qquickabstractcolordialog.cpp + + HEADERS += \ + qquickqcolordialog_p.h \ + ../dialogs/qquickabstractcolordialog_p.h +} + +qtConfig(fontdialog) { + SOURCES += \ + qquickqfontdialog.cpp \ + ../dialogs/qquickabstractfontdialog.cpp + + HEADERS += \ + qquickqfontdialog_p.h \ + ../dialogs/qquickabstractfontdialog_p.h +} load(qml_plugin) diff --git a/src/widgets/widgetsplugin.cpp b/src/widgets/widgetsplugin.cpp index 9ed0e6bc..65233756 100644 --- a/src/widgets/widgetsplugin.cpp +++ b/src/widgets/widgetsplugin.cpp @@ -82,11 +82,18 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.PrivateWidgets")); - +#if QT_CONFIG(messagebox) qmlRegisterType(uri, 1, 1, "QtMessageDialog"); +#endif +#if QT_CONFIG(filedialog) qmlRegisterType(uri, 1, 0, "QtFileDialog"); +#endif +#if QT_CONFIG(colordialog) qmlRegisterType(uri, 1, 0, "QtColorDialog"); +#endif +#if QT_CONFIG(fontdialog) qmlRegisterType(uri, 1, 1, "QtFontDialog"); +#endif } }; -- cgit v1.2.1 From 7b6f57086bbc64ad2f9be0c75a462120fc031e86 Mon Sep 17 00:00:00 2001 From: Jason Erb Date: Wed, 4 Jan 2017 22:07:16 -0500 Subject: Made Button accept space key press and release events Task-number: QTBUG-57853 Change-Id: I33cd09d78e470a85d0f816781e683b7574f673ab Reviewed-by: J-P Nurmi --- src/controls/Private/BasicButton.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index 437ab407..d2eec87e 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.qml @@ -167,8 +167,10 @@ Control { activeFocusOnTab: true Keys.onPressed: { - if (event.key === Qt.Key_Space && !event.isAutoRepeat && !behavior.pressed) + if (event.key === Qt.Key_Space && !event.isAutoRepeat && !behavior.pressed) { behavior.keyPressed = true; + event.accepted = true; + } } onFocusChanged: if (!focus) behavior.keyPressed = false @@ -178,6 +180,7 @@ Control { behavior.keyPressed = false; __action.trigger(button) behavior.toggle() + event.accepted = true; } } -- cgit v1.2.1