From 76952046ceccf2cd176a3452bc908cac769f90d9 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 27 Dec 2013 17:16:47 +0100 Subject: QtQuick.Dialogs: check for inheriting from QApplication Widget-based dialogs are allowed if the application is a QApplication, but subclassing is OK too. Task-number: QTBUG-35769 Change-Id: Iec329792d7c1d85adcb1c3542444f0e92792b20b Reviewed-by: Liang Qi --- src/imports/dialogs/plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports') diff --git a/src/imports/dialogs/plugin.cpp b/src/imports/dialogs/plugin.cpp index 44df1447d1..70e12093b6 100644 --- a/src/imports/dialogs/plugin.cpp +++ b/src/imports/dialogs/plugin.cpp @@ -180,7 +180,7 @@ protected: // If there is a qmldir and we have a QApplication instance (as opposed to a // widget-free QGuiApplication), assume that the widget-based dialog will work. if (hasTopLevelWindows && widgetsDir.exists("qmldir") && - !qstrcmp(QCoreApplication::instance()->metaObject()->className(), "QApplication")) { + QCoreApplication::instance()->inherits("QApplication")) { QUrl dialogQmlPath = m_useResources ? QUrl(QString("qrc:/QtQuick/Dialogs/Widget%1.qml").arg(qmlName)) : QUrl::fromLocalFile(qmlDir.filePath(QString("Widget%1.qml").arg(qmlName))); -- cgit v1.2.3 From 4a82ea4a609ecf728e3d5ed2033461e547470103 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 12 Dec 2013 08:54:22 +0100 Subject: QtQuick ColorDialog: ensure slider rotation takes effect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-35206 Change-Id: Ia6b4f743cd9bea937eb891ddd16776f975d42bcd Reviewed-by: Jan Arve Sæther --- src/imports/dialogs/qquickabstractcolordialog.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/imports') diff --git a/src/imports/dialogs/qquickabstractcolordialog.cpp b/src/imports/dialogs/qquickabstractcolordialog.cpp index abac997ca6..1931bde905 100644 --- a/src/imports/dialogs/qquickabstractcolordialog.cpp +++ b/src/imports/dialogs/qquickabstractcolordialog.cpp @@ -70,6 +70,11 @@ void QQuickAbstractColorDialog::setVisible(bool v) m_dlgHelper->setCurrentColor(m_color); } QQuickAbstractDialog::setVisible(v); + // QTBUG-35206 +#if defined(Q_OS_WIN) + if (m_dialogWindow) + m_dialogWindow->setWidth(m_dialogWindow->width() + 1); +#endif } void QQuickAbstractColorDialog::setModality(Qt::WindowModality m) -- cgit v1.2.3 From fa5db4201945565bd2c5ff42ab233f497666003f Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 30 Dec 2013 16:55:41 +0100 Subject: QtQuick.Dialogs FileDialog: default mode is ExistingFile Previously did not sync the mode with the state of the selectExisting property on construction. Task-number: QTBUG-35877 Change-Id: Ifb630fb51c463025ec2f6a1932714f354552c234 Reviewed-by: Liang Qi --- src/imports/dialogs/qquickabstractfiledialog.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/imports') diff --git a/src/imports/dialogs/qquickabstractfiledialog.cpp b/src/imports/dialogs/qquickabstractfiledialog.cpp index 3a0d5baa83..0cac801311 100644 --- a/src/imports/dialogs/qquickabstractfiledialog.cpp +++ b/src/imports/dialogs/qquickabstractfiledialog.cpp @@ -56,6 +56,7 @@ QQuickAbstractFileDialog::QQuickAbstractFileDialog(QObject *parent) , m_selectMultiple(false) , m_selectFolder(false) { + updateModes(); connect(this, SIGNAL(accepted()), this, SIGNAL(selectionAccepted())); } -- cgit v1.2.3