diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-07-28 16:04:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@digia.com> | 2014-07-28 16:14:42 +0200 |
| commit | acfcbd620b0ceb1f11a3fcf2439127e1558d9d01 (patch) | |
| tree | 3a58a88561e71c7bfa2034073324232b22906665 | |
| parent | 44a63741e7821ee5318f33038e19e9aa5dcf5a24 (diff) | |
| download | qtquickcontrols-acfcbd620b0ceb1f11a3fcf2439127e1558d9d01.tar.gz | |
QtQuick.Dialogs: check for inheriting from QApplication
Widget-based dialogs are allowed if the application is a
QApplication, but subclassing is OK too.
(cherry-picked from qtdeclarative 76952046ceccf2cd176a3452bc908cac769f90d9)
Task-number: QTBUG-35769
Change-Id: I0b74c870488c157913a68e1a30744cd46ae82cee
Reviewed-by: Liang Qi <liang.qi@digia.com>
| -rw-r--r-- | src/dialogs/plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index aef31e50..f9274660 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -197,7 +197,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))); |