diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index 652a805c..a65c50b7 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -126,7 +126,7 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio QStringList pluginCandidates; const QStringList paths = QCoreApplication::libraryPaths(); foreach (const QString &libPath, paths) { - const QDir dir(libPath + QLatin1String("/qmltooling")); + const QDir dir(libPath + QLatin1String("/qml1tooling")); if (dir.exists()) { QStringList plugins(dir.entryList(QDir::Files)); foreach (const QString &pluginPath, plugins) { diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp index 44d4e877..c817c39e 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp +++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp @@ -124,7 +124,7 @@ QDeclarativeInspectorInterface *QDeclarativeInspectorService::loadInspectorPlugi QStringList pluginCandidates; const QStringList paths = QCoreApplication::libraryPaths(); foreach (const QString &libPath, paths) { - const QDir dir(libPath + QLatin1String("/qmltooling")); + const QDir dir(libPath + QLatin1String("/qml1tooling")); if (dir.exists()) foreach (const QString &pluginPath, dir.entryList(QDir::Files)) pluginCandidates << dir.absoluteFilePath(pluginPath); diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 9aca1d87..09b993b5 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,7 +1,7 @@ TARGET = qmldbg_inspector QT += declarative declarative-private gui widgets core-private -PLUGIN_TYPE = qmltooling +PLUGIN_TYPE = qml1tooling PLUGIN_CLASS_NAME = QtQuick1Plugin load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro index ca21b389..20ced897 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro @@ -1,7 +1,7 @@ TARGET = qmldbg_tcp_qtdeclarative QT += declarative declarative-private network -PLUGIN_TYPE = qmltooling +PLUGIN_TYPE = qml1tooling PLUGIN_CLASS_NAME = QTcpServerConnection load(qt_plugin) |