diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-10-05 17:29:55 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-10-06 19:24:14 +0000 |
| commit | 3bc99dd69fb9099a13dd94ebd081dba5c68d6def (patch) | |
| tree | bd5747a3b1e7f60d3489a6f714d56c554e0d0926 /src/dialogs/plugin.cpp | |
| parent | 3b093789b07c670e29d3275e26c4e7122db042ae (diff) | |
Rename QQuickDialog to QQuickDialog1v5.8.0-beta1
This fixes a linking error when Qt is built statically and both
Qt Quick Controls 1 and Qt Quick Controls 2 are used in the same
application, due to Qt Quick Controls 2 also containing a class named
QQuickDialog.
Change-Id: I16ad8b1a3c75d0fa3e4ba1c3ab54a63caf05bbea
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Alex Leutgöb <alex@v-play.net>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/dialogs/plugin.cpp')
| -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 23eeac388..5a13bc9b1 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -177,7 +177,7 @@ public: // Dialog { // @uri QtQuick.Dialogs.AbstractDialog - qmlRegisterType<QQuickDialog>(uri, 1, 2, "AbstractDialog"); // implementation wrapper + qmlRegisterType<QQuickDialog1>(uri, 1, 2, "AbstractDialog"); // implementation wrapper QUrl dialogQmlPath = m_useResources ? QUrl("qrc:/QtQuick/Dialogs/DefaultDialogWrapper.qml") : #ifndef QT_STATIC |