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
9c6d9857
Commit
9c6d9857
authored
Jan 07, 2011
by
hjk
Browse files
fix oversight in OutputFormat refactoring
parent
7000f7ca
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/applicationlauncher.h
View file @
9c6d9857
...
...
@@ -75,9 +75,9 @@ signals:
private
slots
:
void
processStopped
();
void
appendProcessMessage
(
const
QString
&
output
,
bool
onStdErr
);
#ifdef Q_OS_WIN
void
readWinDebugOutput
(
const
QString
&
output
,
bool
onStdErr
);
void
appendWinMessage
(
const
QString
&
output
,
bool
onStdErr
);
void
processFinished
(
int
exitCode
);
#else
void
guiProcessError
();
...
...
src/plugins/projectexplorer/applicationlauncher_win.cpp
View file @
9c6d9857
...
...
@@ -51,12 +51,12 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent)
:
QObject
(
parent
),
d
(
new
ApplicationLauncherPrivate
)
{
connect
(
&
d
->
m_consoleProcess
,
SIGNAL
(
processMessage
(
QString
,
bool
)),
this
,
SIGNAL
(
append
Win
Message
(
QString
,
bool
)));
this
,
SIGNAL
(
append
Process
Message
(
QString
,
bool
)));
connect
(
&
d
->
m_consoleProcess
,
SIGNAL
(
processStopped
()),
this
,
SLOT
(
processStopped
()));
connect
(
&
d
->
m_winGuiProcess
,
SIGNAL
(
processMessage
(
QString
,
bool
)),
this
,
SIGNAL
(
append
Win
Message
(
QString
,
bool
)));
this
,
SIGNAL
(
append
Process
Message
(
QString
,
bool
)));
connect
(
&
d
->
m_winGuiProcess
,
SIGNAL
(
receivedDebugOutput
(
QString
,
bool
)),
this
,
SLOT
(
readWinDebugOutput
(
QString
,
bool
)));
connect
(
&
d
->
m_winGuiProcess
,
SIGNAL
(
processFinished
(
int
)),
...
...
@@ -123,8 +123,7 @@ qint64 ApplicationLauncher::applicationPID() const
return
result
;
}
void
ApplicationLauncher
::
appendWinMessage
(
const
QString
&
output
,
bool
onStdErr
)
void
ApplicationLauncher
::
appendProcessMessage
(
const
QString
&
output
,
bool
onStdErr
)
{
emit
appendMessage
(
output
,
onStdErr
?
ErrorMessageFormat
:
NormalMessageFormat
);
}
...
...
src/plugins/projectexplorer/applicationlauncher_x11.cpp
View file @
9c6d9857
...
...
@@ -78,7 +78,7 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent)
d
->
m_consoleProcess
.
setSettings
(
Core
::
ICore
::
instance
()
->
settings
());
connect
(
&
d
->
m_consoleProcess
,
SIGNAL
(
processMessage
(
QString
,
bool
)),
this
,
S
IGNAL
(
appendMessage
(
QString
,
bool
)));
this
,
S
LOT
(
append
Process
Message
(
QString
,
bool
)));
connect
(
&
d
->
m_consoleProcess
,
SIGNAL
(
processStopped
()),
this
,
SLOT
(
processStopped
()));
}
...
...
@@ -87,6 +87,11 @@ ApplicationLauncher::~ApplicationLauncher()
{
}
void
ApplicationLauncher
::
appendProcessMessage
(
const
QString
&
output
,
bool
onStdErr
)
{
emit
appendMessage
(
output
,
onStdErr
?
ErrorMessageFormat
:
NormalMessageFormat
);
}
void
ApplicationLauncher
::
setWorkingDirectory
(
const
QString
&
dir
)
{
d
->
m_guiProcess
.
setWorkingDirectory
(
dir
);
...
...
src/plugins/projectexplorer/runconfiguration.h
View file @
9c6d9857
...
...
@@ -209,6 +209,7 @@ signals:
public
slots
:
void
bringApplicationToForeground
(
qint64
pid
);
void
appendMessage
(
const
QString
&
error
,
ProjectExplorer
::
OutputFormat
);
private
slots
:
void
bringApplicationToForegroundInternal
();
...
...
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