Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
ba82227a
Commit
ba82227a
authored
Sep 02, 2010
by
Kai Koehne
Browse files
QmlObserver: Disable "Observer" mode when no debugging client is attached
parent
580fbb1a
Changes
3
Hide whitespace changes
Inline
Side-by-side
share/qtcreator/qmljsdebugger/include/qdeclarativedesigndebugserver.h
View file @
ba82227a
...
...
@@ -75,6 +75,8 @@ public Q_SLOTS:
void
contextPathUpdated
(
const
QStringList
&
contextPath
);
Q_SIGNALS:
void
debuggingClientChanged
(
bool
hasDebuggingClient
);
void
currentObjectsChanged
(
const
QList
<
QObject
*>
&
objects
);
void
designModeBehaviorChanged
(
bool
inDesignMode
);
void
reloadRequested
();
...
...
@@ -96,6 +98,7 @@ Q_SIGNALS:
void
clearComponentCacheRequested
();
protected:
virtual
void
enabledChanged
(
bool
enabled
);
virtual
void
messageReceived
(
const
QByteArray
&
);
private:
...
...
share/qtcreator/qmljsdebugger/qdeclarativedesigndebugserver.cpp
View file @
ba82227a
...
...
@@ -58,6 +58,11 @@ QDeclarativeDesignDebugServer *QDeclarativeDesignDebugServer::instance()
return
qmlDesignDebugServer
();
}
void
QDeclarativeDesignDebugServer
::
enabledChanged
(
bool
enabled
)
{
emit
debuggingClientChanged
(
enabled
);
}
void
QDeclarativeDesignDebugServer
::
messageReceived
(
const
QByteArray
&
message
)
{
QDataStream
ds
(
message
);
...
...
src/tools/qml/qmlobserver/qmlruntime.cpp
View file @
ba82227a
...
...
@@ -55,6 +55,7 @@
#endif
#include
<qdeclarativedesignview.h>
#include
<qdeclarativedesigndebugserver.h>
#include
<utils/crumblepath.h>
#include
"qmlruntime.h"
...
...
@@ -785,8 +786,10 @@ void QDeclarativeViewer::createMenu()
designModeBehaviorAction
->
setShortcut
(
QKeySequence
(
"Ctrl+D"
));
designModeBehaviorAction
->
setCheckable
(
true
);
designModeBehaviorAction
->
setChecked
(
canvas
->
designModeBehavior
());
designModeBehaviorAction
->
setEnabled
(
QDeclarativeDesignDebugServer
::
hasDebuggingClient
());
connect
(
designModeBehaviorAction
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
setDesignModeBehavior
(
bool
)));
connect
(
canvas
,
SIGNAL
(
designModeBehaviorChanged
(
bool
)),
designModeBehaviorAction
,
SLOT
(
setChecked
(
bool
)));
connect
(
QDeclarativeDesignDebugServer
::
instance
(),
SIGNAL
(
debuggingClientChanged
(
bool
)),
designModeBehaviorAction
,
SLOT
(
setEnabled
(
bool
)));
QAction
*
proxyAction
=
new
QAction
(
tr
(
"HTTP &Proxy..."
),
this
);
connect
(
proxyAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showProxySettings
()));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment