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

QmlJSInspector: Renamed Observer to Inspector

Browse Source 
Manually redid Qt 4.8 commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.

In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.

Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Thorbjørn Lindeijer
2011-05-30 16:32:25 +02:00
committed by Kai Koehne
parent e0f79761f3
commit 335f6ad0f7
51 changed files with 528 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljsinspector/qmljslivetextpreview.h
View File

@@ -90,7 +90,7 @@ signals:
void disableLivePreviewRequested();
public slots:
void setApplyChangesToQmlObserver(bool applyChanges);
void setApplyChangesToQmlInspector(bool applyChanges);
void updateDebugIds();
private slots:
@@ -117,7 +117,7 @@ private:
QList<QWeakPointer<QmlJSEditor::QmlJSTextEditorWidget> > m_editors;
bool m_applyChangesToQmlObserver;
bool m_applyChangesToQmlInspector;
QmlJS::Document::Ptr m_docWithUnappliedChanges;
QWeakPointer<ClientProxy> m_clientProxy;