feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Make QmlEngine heed "Sort Struct Members Alphabetically"

Browse Source 
Change-Id: Ib24e62c60eea4b0af355c3e93e48a78dc0b51efc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-07-15 17:49:04 +02:00
parent 184b161224
commit f77f6e2144
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -62,6 +62,7 @@
#include <texteditor/textdocument.h> #include <texteditor/textdocument.h>
#include <texteditor/texteditor.h> #include <texteditor/texteditor.h>
#include <utils/treemodel.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QDebug> #include <QDebug>
@@ -90,6 +91,7 @@ using namespace ProjectExplorer;
using namespace QmlDebug; using namespace QmlDebug;
using namespace QmlJS; using namespace QmlJS;
using namespace TextEditor; using namespace TextEditor;
using namespace Utils;
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
@@ -937,6 +939,11 @@ void QmlEngine::reloadSourceFiles()
d->scripts(4, QList<int>(), true, QVariant()); d->scripts(4, QList<int>(), true, QVariant());
} }
void QmlEngine::updateAll()
{
d->updateLocals();
}
void QmlEngine::requestModuleSymbols(const QString &moduleName) void QmlEngine::requestModuleSymbols(const QString &moduleName)
{ {
Q_UNUSED(moduleName) Q_UNUSED(moduleName)
@@ -2354,6 +2361,12 @@ void QmlEnginePrivate::insertSubItems(WatchItem *parent, const QVariantList &pro
item->setHasChildren(propertyData.properties.count()); item->setHasChildren(propertyData.properties.count());
parent->appendChild(item); parent->appendChild(item);
} }
if (boolSetting(SortStructMembers))
parent->sortChildren([](const TreeItem *item1, const TreeItem *item2) -> bool {
return static_cast<const WatchItem *>(item1)->name
< static_cast<const WatchItem *>(item2)->name;
});
} }
void QmlEnginePrivate::handleExecuteDebuggerCommand(const QVariantMap &response) void QmlEnginePrivate::handleExecuteDebuggerCommand(const QVariantMap &response)

1
src/plugins/debugger/qml/qmlengine.h
View File

@@ -129,6 +129,7 @@ private:
void reloadSourceFiles(); void reloadSourceFiles();
void reloadFullStack() {} void reloadFullStack() {}
void updateAll();
void updateItem(const QByteArray &iname); void updateItem(const QByteArray &iname);
void expandItem(const QByteArray &iname); void expandItem(const QByteArray &iname);
void selectWatchData(const QByteArray &iname); void selectWatchData(const QByteArray &iname);