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
1ed42339
Commit
1ed42339
authored
Feb 22, 2011
by
Thorbjørn Lindeijer
Browse files
QmlJSDebugger: Don't create the tool box when compiling for a device
parent
a5d3fcbc
Changes
2
Hide whitespace changes
Inline
Side-by-side
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
View file @
1ed42339
...
...
@@ -62,7 +62,6 @@ public:
QDeclarativeView
*
declarativeView
();
QToolBar
*
toolBar
()
const
;
static
QString
idStringForObject
(
QObject
*
obj
);
QRectF
adjustToScreenBoundaries
(
const
QRectF
&
boundingRectInSceneSpace
);
...
...
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
View file @
1ed42339
...
...
@@ -132,7 +132,9 @@ QDeclarativeViewObserver::QDeclarativeViewObserver(QDeclarativeView *view, QObje
connect
(
data
->
subcomponentEditorTool
,
SIGNAL
(
contextPathChanged
(
QStringList
)),
data
->
debugService
,
SLOT
(
contextPathUpdated
(
QStringList
)));
#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5)
data
->
createToolBox
();
#endif
data
->
_q_changeToSingleSelectTool
();
}
...
...
@@ -454,7 +456,8 @@ void QDeclarativeViewObserver::setDesignModeBehavior(bool value)
{
emit
designModeBehaviorChanged
(
value
);
data
->
toolBar
->
setDesignModeBehavior
(
value
);
if
(
data
->
toolBar
)
data
->
toolBar
->
setDesignModeBehavior
(
value
);
data
->
debugService
->
setDesignModeBehavior
(
value
);
data
->
designModeBehavior
=
value
;
...
...
@@ -848,11 +851,6 @@ QRectF QDeclarativeViewObserver::adjustToScreenBoundaries(const QRectF &bounding
return
boundingRect
;
}
QToolBar
*
QDeclarativeViewObserver
::
toolBar
()
const
{
return
data
->
toolBar
;
}
void
QDeclarativeViewObserverPrivate
::
createToolBox
()
{
toolBar
=
new
QmlToolBar
;
...
...
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