From 290835300da4fc1733b3400f99b79f781c1f0f5f Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Tue, 24 Aug 2010 16:30:24 +0200
Subject: [PATCH] QML Inspector: Renamed Design Mode to Observer Mode
---
.../qtcreator/qmljsdebugger/editor/editor.qrc | 4 ++--
.../editor/images/designmode-24.png | Bin 4227 -> 0 bytes
.../editor/images/observermode-24.png | Bin 0 -> 1283 bytes
.../{designmode.png => observermode.png} | Bin 3596 -> 3539 bytes
.../qmljsdebugger/editor/qmltoolbar.cpp | 2 +-
.../{designmode.png => observermode.png} | Bin 3596 -> 3539 bytes
.../qmljsinspector/qmlinspectortoolbar.cpp | 20 +++++++++---------
.../qmljsinspector/qmlinspectortoolbar.h | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
delete mode 100644 share/qtcreator/qmljsdebugger/editor/images/designmode-24.png
create mode 100644 share/qtcreator/qmljsdebugger/editor/images/observermode-24.png
rename share/qtcreator/qmljsdebugger/editor/images/{designmode.png => observermode.png} (76%)
rename src/plugins/qmljsinspector/images/{designmode.png => observermode.png} (76%)
diff --git a/share/qtcreator/qmljsdebugger/editor/editor.qrc b/share/qtcreator/qmljsdebugger/editor/editor.qrc
index 09fc2f6fb01..77744d57bb4 100644
--- a/share/qtcreator/qmljsdebugger/editor/editor.qrc
+++ b/share/qtcreator/qmljsdebugger/editor/editor.qrc
@@ -8,11 +8,9 @@
<file>images/pause.png</file>
<file>images/from-qml.png</file>
<file>images/to-qml.png</file>
- <file>images/designmode.png</file>
<file>images/color-picker-hicontrast.png</file>
<file>images/zoom.png</file>
<file>images/color-picker-24.png</file>
- <file>images/designmode-24.png</file>
<file>images/from-qml-24.png</file>
<file>images/pause-24.png</file>
<file>images/play-24.png</file>
@@ -20,5 +18,7 @@
<file>images/zoom-24.png</file>
<file>images/select-24.png</file>
<file>images/select-marquee-24.png</file>
+ <file>images/observermode.png</file>
+ <file>images/observermode-24.png</file>
</qresource>
</RCC>
diff --git a/share/qtcreator/qmljsdebugger/editor/images/designmode-24.png b/share/qtcreator/qmljsdebugger/editor/images/designmode-24.png
deleted file mode 100644
index b4e0ff43ff7ab3d2a95f08fadce9e22796e37117..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4227
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
Za{&F-n}K%fT1x-`002ovPDHLkV1j{V`f30G
diff --git a/share/qtcreator/qmljsdebugger/editor/images/observermode-24.png b/share/qtcreator/qmljsdebugger/editor/images/observermode-24.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e74d867c0a62eece4fd0986d950572814551e16
GIT binary patch
literal 1283
zcmV+e1^oJnP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$rAb6VRCwC7Ra<WxRS=%N_=;o4IEfSI
zYNxStX&MDp2!vGfNGL5-6k2!%@euKX5byxv5AeiOC7?V&1(X-=R5TQUs+3+(Lvw2!
zCvh&Woy2kC%lfjrXLp&ib{snif|nd=cFvr0cD|W8GjkYC)8H@%-~D#$zD3*k(;Tw1
zNasP*jswHA=o^|gjq_EUjUs&^4F0_KUjR(tt(LvYpG5Xiz~AL}I-THf*x`}EqhK+c
zU~@A8>2wA{^I;hK^R|M3Un1bU2(<FQ08sgB$S$0D?iAbK*Ny)(5Z~N_U}yoFJ&kb0
z+XfO*fMXfz4&1nT2d-WFJ%b?6Bgp7M09@S@_8sMC{asz3oj!Gv>GZYh%IUCJEl}@r
zK_t2c+sQQ89S)F*3W}nE$I}drO>Wcu`?KebYh7bfQz*O_fGsJvXqx)*z_9^naMwd#
zBp~D^C?Ho96$~Z=^mO}Cu>y0UMIg8)Q$o3|tplDpdD4K%@*V2wJrF=4(yM)a{k6@l
z&5$n;og_(toG2rZ46>{O^~dXNM{p6Amm@$(5r6`DeVs5gG-Oj%<#H)OssU7$yx7v(
zp}U?#<+A>BktB&gCM%+1g<cu>yk3YWwm`_{bx#Nd!E-&m{SXNB9Mx3yrF{S_%ljR6
z2jr-=70RjQJM%1tOh6!><G_a&&xPiT`*O(>q(FBsHTInY0606t8$iUc$g-kmid?cx
zssJhAeo7F*Xf%M;YJ=sK)hdIWt_I+EV=souQ7*J%h?GJ$S1?<xd?|UWSaHtmN)*)H
z*aXv46R`eZ4z@N{K@#)eX%E1|E*BeJnLmcdu9pF1F}oa($7?;!7N}HRp|iNM`+=?a
z2F#9MMe8K6S}Z_Y&h*_sfHT%meJ-XlMCnB2+welL>?*xDJr&EcTD6x>Cg8W9E`mlx
zFq=#m0aXVuW3}gn1Q=Oqu&U4&f0&u&%#N2?&RpZHYXlV!tEvW?3Od(ijmpLKv8$hh
zklq5L$%ufYObv~#P-Az3C>G3ObM%w42Q;jU6Te;#PTh(HXU27lcZ#W)io0H{N5c@0
zEn)2tDCF~a*>=e1ayo@(?m}c~7CJh*`rbS7%j3ESi5uyskb6``{#4kGMKOtbB$?Fl
zycsRD7A@Cyy$A>Yf{oZBR=5K7ZV#|LkM|KPh7j9_EERA+%)}z|rjchaq&RGL^BATD
zB;q*EPt1OOYax@`JdzQFnrt>>rag(}48X8F(5GW5cn6Z35A?XV`vR~OngSxrdU~q}
zs$d9-%KVtwUQ;H=$9((&4Ny#OEWJ;pd;s}y)amx~28+jNeh8Dr2C3vWT1)hU27?I*
zS}e-cyYl}jq&G~bH^Rv)aHa|%_(6o;iC4_0FLk_bAB|lMT@q4jCm4o3XRCEvIfL1z
z5=mt^6N9N3AVhAXotqYAY5a{e;&>sUcU5(G{hPfWJW3B?*d!`6y}~2`gzphJ8IR0t
z<N74+WQNk=0rz9W!HMf1VtS3>{oHe&OUCy-nUw-6xcM&+Q<QEaO;#>`wf^Q6R&#ec
tYmE2M+W3Jl+F?KXEFAJUbbx;Z7yv*G(j+*6w9o(m002ovPDHLkV1nFCR>uGU
literal 0
HcmV?d00001
diff --git a/share/qtcreator/qmljsdebugger/editor/images/designmode.png b/share/qtcreator/qmljsdebugger/editor/images/observermode.png
similarity index 76%
rename from share/qtcreator/qmljsdebugger/editor/images/designmode.png
rename to share/qtcreator/qmljsdebugger/editor/images/observermode.png
index b6a95e77bc2f9acc4f6676914de8315e680ec856..daed21c9448aa789ed398125fb4d46d8f4d6dda0 100644
GIT binary patch
delta 802
zcmV+-1Ks?L9Mc=HzY2c>{z*hZRCwB?lg)2bRT##fbIv_;KjzLyp&f=>+G(@{B!IL`
zEJj(dFlq=YAx0xHE?hu@JJ&AU`zN@8ovv6A0|XL6G&Mm&Q#7^(+e)X?&UBcs-pl<w
z=Uf(0H13SQ{rgLv_sK(QZ=VMM5JKSlL5Wauu9(k%P%f8tg<*f_x~{jd*=$|W7`v6V
z?IcZ8{1a{G*z=x(XZVE!)ydBbg~H_6m;>7~&}_Aj&p-IRTCX=saU5UPbsb8nmjdRz
zQiBj8W0~d;AHIL;%d=-r@2XTPkO~-e986CgWv?AMG+|lUGYgALqf*MNob$g0dn!{P
zgnawyCm(+?GxL8s2HPGu*Pt6Z7M51f>$@lxhfuBVhhZ4C#igZD09P4f&jq=WSN9%1
zeB{!bZ=J|=doH}EA%ZADhI0%J74X;NbqFD$X&jZx1e8*><>lpHHO3wh08}YCT`upl
z!x(V=2(eHILV<SILzDoO$~c-^ZFG7r5~bn9$#>v5&NqL45KuxHG>z*fVH|#tAc_UZ
zPB;RDJr9;;AYa&xjm<W;nhj)a8@q@1)av!MeNx10ni65Z+aDl^CBjI)sC1{Q6o?5#
zB607hD+t{d0D_d~sR+6g_2#2BCL_P2z|W0MP8BsxLmbDDGKG{WD9s=a1KhcG3GK!r
z4AX*cn23Ku54N41ojx{mpGCodHtP?SqUO8K#35*0hmZ<VN>Fa%kGb2J|K&#vm&YMf
zz;#_Dafq2WPUbIu_4Q>2;9#nfo12dp=RD7QkDEoE8#(BP4V41F-Mx<OUK6Fg<8b>O
z^txU6o{Lsvr5pr-%K&T<LKB$;3mdC*>#dE|?e2e*W~txn<htz*tgp;Ni3B;@Mx(w8
znNldif++OQK726i?L3_VI8H#;tU{^5w9GLf#b?9L!H5tVa4JR)?5}=w@9xj31fM08
zerM_IMwX|~xA1~L31v?*MiznFxgYw2K`Zu_N5+mKS1h1Z9{oPUlo_e?*2|_T1^M^7
g{wo?3|C46}0D&iAMhZia1poj507*qoM6N<$f_(mZa{vGU
delta 859
zcmV-h1El=Z8;l&VzY2c?H%UZ6RCwB?Q~OU-cN{(U-WFPDX(>2HNoJ5#h)#x$(<zd=
zWX9^Ek&OMYEzH*@_}EW#{IEgHUYg9Y%rGAz8H*U>7MwEY9CJDoFd4r{bR=|P6fLX}
z+S<o$@4fAPd_VhvtZqMh{(#Rp=X1{ChzL&t696>4_!h*p1Ydunw>>-`xi=Y{9jz!Y
zMJ%o2<)%7RPxNALdI~114VtQhnA)HUmdc*{($72qL}GE&uUzi`{KErh-aGXADMiUy
zVu=(4fzLB>9H41B^i0-MR$ce~^Se7X0ss#H4XbKjJAbC@TA9;^O^wfa&z=6@maZGt
zNGt(C;K6Ym6a{}!<!qC8qj!RN)+#&SIr?S(fVaMOo4LRwL{l1c#=*a7&4%NhZMO`A
ziXNq8sM#EJ1$$cCb`8rF9#hZx%f60-Z$<$CM1*?ZUdQpC?|zsH#V92iG!=>v5z)ZS
zKZf5p@X1rheC0>RzuHHmC);Rg3ICb3aFLmaz!4E@*SCK{(=>knuI4M-{Y^W{N*%D+
zi=i{%w-bj`&)6l$)5SdYcJ@ib2`s5{@(K}QCdL+1aFo~}iW%11KiJHeG3ej=(sm~!
z1TGxIQk&#(@e<ze8Zbs4VP93HQ{kD8f73SsfRtr06&4{aCs}vjFU@whXJEBF(p(@;
zL*P>Qrhk73vsE6=v!d~`u4r)DtuUB@{1a;`faPuzn%31|?UIBMzSwm&H}@wBGhqx}
z9KzK&aP;gYOK<l_zk)XxWwHcwq5ZLfWfg$cYKGlaf&%xl)&~CfPm_TeJQxq)W|Bio
z=PA6fx*j$&`8p1^jC^r+V4El=7xD@e6;KTUi9~<;mGQ9FUtVK#uX;9vZ>JG<ZEhd+
zZ)w5U-2f(ob68nd?JX{{xN<q|u?4f)EEtBdb?)!brN1Wb<Lwh6{4^t+tld!Q8JjfL
zUm3jqBax0!IEs(E&uvMir9i3kKNe(JcE{uKzEJ2P78WAe`T5A{V36M3yv_}#inwum
z^i@+amH2uxID38iVfaRQne+c+l4UuWPN&<W(U?^fMG0Wn7$an49S*w{j3{^e&R81&
l$yHjCFCc)$B0UNI82}{mhthYkmq-8r002ovPDHLkV1j%Zp<e(1
diff --git a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
index 585996a80cb..97f674da9b7 100644
--- a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
@@ -15,7 +15,7 @@ QmlToolbar::QmlToolbar(QWidget *parent) :
m_isRunning(false),
ui(new Ui)
{
- ui->designmode = new QAction(QIcon(QLatin1String(":/qml/images/designmode-24.png")), tr("Design Mode"), this);
+ ui->designmode = new QAction(QIcon(QLatin1String(":/qml/images/observermode-24.png")), tr("Observer Mode"), this);
ui->play = new QAction(QIcon(QLatin1String(":/qml/images/play-24.png")), tr("Play"), this);
ui->pause = new QAction(QIcon(QLatin1String(":/qml/images/pause-24.png")), tr("Pause"), this);
ui->select = new QAction(QIcon(QLatin1String(":/qml/images/select-24.png")), tr("Select"), this);
diff --git a/src/plugins/qmljsinspector/images/designmode.png b/src/plugins/qmljsinspector/images/observermode.png
similarity index 76%
rename from src/plugins/qmljsinspector/images/designmode.png
rename to src/plugins/qmljsinspector/images/observermode.png
index b6a95e77bc2f9acc4f6676914de8315e680ec856..daed21c9448aa789ed398125fb4d46d8f4d6dda0 100644
GIT binary patch
delta 802
zcmV+-1Ks?L9Mc=HzY2c>{z*hZRCwB?lg)2bRT##fbIv_;KjzLyp&f=>+G(@{B!IL`
zEJj(dFlq=YAx0xHE?hu@JJ&AU`zN@8ovv6A0|XL6G&Mm&Q#7^(+e)X?&UBcs-pl<w
z=Uf(0H13SQ{rgLv_sK(QZ=VMM5JKSlL5Wauu9(k%P%f8tg<*f_x~{jd*=$|W7`v6V
z?IcZ8{1a{G*z=x(XZVE!)ydBbg~H_6m;>7~&}_Aj&p-IRTCX=saU5UPbsb8nmjdRz
zQiBj8W0~d;AHIL;%d=-r@2XTPkO~-e986CgWv?AMG+|lUGYgALqf*MNob$g0dn!{P
zgnawyCm(+?GxL8s2HPGu*Pt6Z7M51f>$@lxhfuBVhhZ4C#igZD09P4f&jq=WSN9%1
zeB{!bZ=J|=doH}EA%ZADhI0%J74X;NbqFD$X&jZx1e8*><>lpHHO3wh08}YCT`upl
z!x(V=2(eHILV<SILzDoO$~c-^ZFG7r5~bn9$#>v5&NqL45KuxHG>z*fVH|#tAc_UZ
zPB;RDJr9;;AYa&xjm<W;nhj)a8@q@1)av!MeNx10ni65Z+aDl^CBjI)sC1{Q6o?5#
zB607hD+t{d0D_d~sR+6g_2#2BCL_P2z|W0MP8BsxLmbDDGKG{WD9s=a1KhcG3GK!r
z4AX*cn23Ku54N41ojx{mpGCodHtP?SqUO8K#35*0hmZ<VN>Fa%kGb2J|K&#vm&YMf
zz;#_Dafq2WPUbIu_4Q>2;9#nfo12dp=RD7QkDEoE8#(BP4V41F-Mx<OUK6Fg<8b>O
z^txU6o{Lsvr5pr-%K&T<LKB$;3mdC*>#dE|?e2e*W~txn<htz*tgp;Ni3B;@Mx(w8
znNldif++OQK726i?L3_VI8H#;tU{^5w9GLf#b?9L!H5tVa4JR)?5}=w@9xj31fM08
zerM_IMwX|~xA1~L31v?*MiznFxgYw2K`Zu_N5+mKS1h1Z9{oPUlo_e?*2|_T1^M^7
g{wo?3|C46}0D&iAMhZia1poj507*qoM6N<$f_(mZa{vGU
delta 859
zcmV-h1El=Z8;l&VzY2c?H%UZ6RCwB?Q~OU-cN{(U-WFPDX(>2HNoJ5#h)#x$(<zd=
zWX9^Ek&OMYEzH*@_}EW#{IEgHUYg9Y%rGAz8H*U>7MwEY9CJDoFd4r{bR=|P6fLX}
z+S<o$@4fAPd_VhvtZqMh{(#Rp=X1{ChzL&t696>4_!h*p1Ydunw>>-`xi=Y{9jz!Y
zMJ%o2<)%7RPxNALdI~114VtQhnA)HUmdc*{($72qL}GE&uUzi`{KErh-aGXADMiUy
zVu=(4fzLB>9H41B^i0-MR$ce~^Se7X0ss#H4XbKjJAbC@TA9;^O^wfa&z=6@maZGt
zNGt(C;K6Ym6a{}!<!qC8qj!RN)+#&SIr?S(fVaMOo4LRwL{l1c#=*a7&4%NhZMO`A
ziXNq8sM#EJ1$$cCb`8rF9#hZx%f60-Z$<$CM1*?ZUdQpC?|zsH#V92iG!=>v5z)ZS
zKZf5p@X1rheC0>RzuHHmC);Rg3ICb3aFLmaz!4E@*SCK{(=>knuI4M-{Y^W{N*%D+
zi=i{%w-bj`&)6l$)5SdYcJ@ib2`s5{@(K}QCdL+1aFo~}iW%11KiJHeG3ej=(sm~!
z1TGxIQk&#(@e<ze8Zbs4VP93HQ{kD8f73SsfRtr06&4{aCs}vjFU@whXJEBF(p(@;
zL*P>Qrhk73vsE6=v!d~`u4r)DtuUB@{1a;`faPuzn%31|?UIBMzSwm&H}@wBGhqx}
z9KzK&aP;gYOK<l_zk)XxWwHcwq5ZLfWfg$cYKGlaf&%xl)&~CfPm_TeJQxq)W|Bio
z=PA6fx*j$&`8p1^jC^r+V4El=7xD@e6;KTUi9~<;mGQ9FUtVK#uX;9vZ>JG<ZEhd+
zZ)w5U-2f(ob68nd?JX{{xN<q|u?4f)EEtBdb?)!brN1Wb<Lwh6{4^t+tld!Q8JjfL
zUm3jqBax0!IEs(E&uvMir9i3kKNe(JcE{uKzEJ2P78WAe`T5A{V36M3yv_}#inwum
z^i@+amH2uxID38iVfaRQne+c+l4UuWPN&<W(U?^fMG0Wn7$an49S*w{j3{^e&R81&
l$yHjCFCc)$B0UNI82}{mhthYkmq-8r002ovPDHLkV1j%Zp<e(1
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
index a63fa116da5..688f63d0368 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
@@ -58,7 +58,7 @@ static QToolButton *createToolButton(QAction *action)
QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) :
QObject(parent),
- m_designmodeAction(0),
+ m_observerModeAction(0),
m_reloadAction(0),
m_playAction(0),
m_selectAction(0),
@@ -88,7 +88,7 @@ QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) :
void QmlInspectorToolbar::setEnabled(bool value)
{
- m_designmodeAction->setEnabled(value);
+ m_observerModeAction->setEnabled(value);
//m_toQmlAction->setEnabled(value);
m_fromQmlAction->setEnabled(value);
@@ -107,7 +107,7 @@ void QmlInspectorToolbar::enable()
{
setEnabled(true);
m_emitSignals = false;
- m_designmodeAction->setChecked(false);
+ m_observerModeAction->setChecked(false);
setAnimationSpeed(1.0f);
activateDesignModeOnClick();
m_emitSignals = true;
@@ -176,7 +176,7 @@ void QmlInspectorToolbar::setAnimationSpeed(qreal slowdownFactor)
void QmlInspectorToolbar::setDesignModeBehavior(bool inDesignMode)
{
m_emitSignals = false;
- m_designmodeAction->setChecked(inDesignMode);
+ m_observerModeAction->setChecked(inDesignMode);
activateDesignModeOnClick();
m_emitSignals = true;
}
@@ -187,7 +187,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
Core::ActionManager *am = core->actionManager();
m_fromQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/from-qml-small.png")), tr("Apply Changes to Document"), this);
- m_designmodeAction = new QAction(QIcon(QLatin1String(":/qml/images/designmode.png")), tr("Design Mode"), this);
+ m_observerModeAction = new QAction(QIcon(QLatin1String(":/qml/images/observermode.png")), tr("Observer Mode"), this);
m_reloadAction = new QAction(QIcon(QLatin1String(":/qml/images/reload.png")), tr("Reload"), this);
m_playAction = new QAction(m_playIcon, tr("Play animations"), this);
@@ -197,8 +197,8 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
m_colorPickerAction = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-small.png")), tr("Color Picker"), this);
m_toQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/to-qml-small.png")), tr("Live Preview Changes in QML Viewer"), this);
- m_designmodeAction->setCheckable(true);
- m_designmodeAction->setChecked(false);
+ m_observerModeAction->setCheckable(true);
+ m_observerModeAction->setChecked(false);
m_selectAction->setCheckable(true);
m_selectMarqueeAction->setCheckable(true);
m_zoomAction->setCheckable(true);
@@ -207,7 +207,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
m_fromQmlAction->setCheckable(true);
m_fromQmlAction->setChecked(true);
- am->registerAction(m_designmodeAction, QmlJSInspector::Constants::DESIGNMODE_ACTION, context);
+ am->registerAction(m_observerModeAction, QmlJSInspector::Constants::DESIGNMODE_ACTION, context);
am->registerAction(m_reloadAction, QmlJSInspector::Constants::RELOAD_ACTION, context);
am->registerAction(m_playAction, QmlJSInspector::Constants::PLAY_ACTION, context);
am->registerAction(m_selectAction, QmlJSInspector::Constants::SELECT_ACTION, context);
@@ -288,7 +288,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
setEnabled(false);
- connect(m_designmodeAction, SIGNAL(triggered()), SLOT(activateDesignModeOnClick()));
+ connect(m_observerModeAction, SIGNAL(triggered()), SLOT(activateDesignModeOnClick()));
connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected()));
connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick()));
@@ -341,7 +341,7 @@ void QmlInspectorToolbar::changeToTenthAnimSpeed()
void QmlInspectorToolbar::activateDesignModeOnClick()
{
- bool checked = m_designmodeAction->isChecked();
+ bool checked = m_observerModeAction->isChecked();
m_reloadAction->setEnabled(true);
m_playAction->setEnabled(checked);
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
index 9d2d4165fc9..b4e9e253820 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
@@ -118,7 +118,7 @@ private slots:
void updatePauseAction();
private:
- QAction *m_designmodeAction;
+ QAction *m_observerModeAction;
QAction *m_reloadAction;
QAction *m_playAction;
QAction *m_selectAction;
--
GitLab