diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-05-07 13:19:46 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 13:18:21 +0200 |
| commit | 8d0159a64e7b10e8c39ade516b27a06d875bff65 (patch) | |
| tree | 37dcdfd2bf4b450781e39c8d51be86f18c1aa9ec /src/declarative | |
| parent | fbb7ee568befc58c9d301c1064a1c7d0b7ce3462 (diff) | |
Move debugger plugins into separate qml1tooling directory
Separate the QML 1 and QML 2 debugger plugins. This helps avoid
a nasty crash in libgobject when (uneccessarily) loading and unloading
the wrong plugins.
Task-number: QTCREATORBUG-9232
Change-Id: I0bce7b364fcce983ccaa531d9008609ff08bb77f
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugserver.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/debugger/qdeclarativeinspectorservice.cpp | 2 |
2 files changed, 2 insertions, 2 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); |