diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-12-27 17:16:47 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-29 12:15:05 +0100 |
| commit | 76952046ceccf2cd176a3452bc908cac769f90d9 (patch) | |
| tree | 511cb5d7ddd04769ca7478ba2e30f621b3a3faf7 /src/imports | |
| parent | 88424bbd95e8ed469e312fe8afaf74bab2e609f9 (diff) | |
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 <liang.qi@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/dialogs/plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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))); |