Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
fd81a276
Commit
fd81a276
authored
Mar 17, 2010
by
Lasse Holmstedt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only attempt to connect debugger if debug mode is activated
parent
0535eb09
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.cpp
+1
-1
src/plugins/projectexplorer/projectexplorer.h
src/plugins/projectexplorer/projectexplorer.h
+1
-1
src/plugins/qmlinspector/qmlinspectorplugin.cpp
src/plugins/qmlinspector/qmlinspectorplugin.cpp
+10
-6
src/plugins/qmlinspector/qmlinspectorplugin.h
src/plugins/qmlinspector/qmlinspectorplugin.h
+1
-1
No files found.
src/plugins/projectexplorer/projectexplorer.cpp
View file @
fd81a276
...
...
@@ -1259,7 +1259,7 @@ void ProjectExplorerPlugin::buildStateChanged(Project * pro)
void
ProjectExplorerPlugin
::
executeRunConfiguration
(
RunConfiguration
*
runConfiguration
,
const
QString
&
runMode
)
{
if
(
IRunControlFactory
*
runControlFactory
=
findRunControlFactory
(
runConfiguration
,
runMode
))
{
emit
aboutToExecuteProject
(
runConfiguration
->
target
()
->
project
());
emit
aboutToExecuteProject
(
runConfiguration
->
target
()
->
project
()
,
runMode
);
RunControl
*
control
=
runControlFactory
->
create
(
runConfiguration
,
runMode
);
startRunControl
(
control
,
runMode
);
...
...
src/plugins/projectexplorer/projectexplorer.h
View file @
fd81a276
...
...
@@ -146,7 +146,7 @@ signals:
void
currentProjectChanged
(
ProjectExplorer
::
Project
*
project
);
void
currentNodeChanged
(
ProjectExplorer
::
Node
*
node
,
ProjectExplorer
::
Project
*
project
);
void
aboutToExecuteProject
(
ProjectExplorer
::
Project
*
project
);
void
aboutToExecuteProject
(
ProjectExplorer
::
Project
*
project
,
const
QString
&
runMode
);
void
settingsChanged
();
...
...
src/plugins/qmlinspector/qmlinspectorplugin.cpp
View file @
fd81a276
...
...
@@ -65,6 +65,7 @@
using
namespace
Qml
;
static
QToolButton
*
createToolButton
(
QAction
*
action
)
{
QToolButton
*
button
=
new
QToolButton
;
...
...
@@ -95,6 +96,7 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
Q_UNUSED
(
arguments
);
Q_UNUSED
(
errorString
);
Core
::
ICore
*
core
=
Core
::
ICore
::
instance
();
connect
(
Core
::
ModeManager
::
instance
(),
SIGNAL
(
currentModeChanged
(
Core
::
IMode
*
)),
SLOT
(
prepareDebugger
(
Core
::
IMode
*
)));
...
...
@@ -119,8 +121,8 @@ void QmlInspectorPlugin::extensionsInitialized()
ProjectExplorer
::
ProjectExplorerPlugin
*
pex
=
ProjectExplorer
::
ProjectExplorerPlugin
::
instance
();
if
(
pex
)
{
connect
(
pex
,
SIGNAL
(
aboutToExecuteProject
(
ProjectExplorer
::
Project
*
)),
SLOT
(
activateDebuggerForProject
(
ProjectExplorer
::
Project
*
)));
connect
(
pex
,
SIGNAL
(
aboutToExecuteProject
(
ProjectExplorer
::
Project
*
,
QString
)),
SLOT
(
activateDebuggerForProject
(
ProjectExplorer
::
Project
*
,
QString
)));
}
QWidget
*
configBar
=
new
QWidget
;
...
...
@@ -147,11 +149,13 @@ void QmlInspectorPlugin::activateDebugger(const QString &langName)
}
}
void
QmlInspectorPlugin
::
activateDebuggerForProject
(
ProjectExplorer
::
Project
*
project
)
void
QmlInspectorPlugin
::
activateDebuggerForProject
(
ProjectExplorer
::
Project
*
project
,
const
QString
&
runMode
)
{
QmlProjectManager
::
QmlProject
*
qmlproj
=
qobject_cast
<
QmlProjectManager
::
QmlProject
*>
(
project
);
if
(
qmlproj
)
m_connectionTimer
->
start
();
if
(
runMode
==
ProjectExplorer
::
Constants
::
DEBUGMODE
)
{
QmlProjectManager
::
QmlProject
*
qmlproj
=
qobject_cast
<
QmlProjectManager
::
QmlProject
*>
(
project
);
if
(
qmlproj
)
m_connectionTimer
->
start
();
}
}
void
QmlInspectorPlugin
::
pollInspector
()
...
...
src/plugins/qmlinspector/qmlinspectorplugin.h
View file @
fd81a276
...
...
@@ -64,7 +64,7 @@ public:
public
slots
:
void
activateDebugger
(
const
QString
&
langName
);
void
activateDebuggerForProject
(
ProjectExplorer
::
Project
*
project
);
void
activateDebuggerForProject
(
ProjectExplorer
::
Project
*
project
,
const
QString
&
runMode
);
void
setDockWidgetArrangement
(
const
QString
&
activeLanguage
);
private
slots
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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