WSL/SLF GitLab Repository
Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
snow-models
inishell
Commits
a05a7ca0
Commit
a05a7ca0
authored
Feb 02, 2022
by
Mathias Bavay
Browse files
More fixes for Qt5.15 or Qt6
parent
d217b08c
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/gui/WorkflowPanel.cc
View file @
a05a7ca0
...
...
@@ -595,7 +595,14 @@ bool WorkflowPanel::actionSystemCommand(const QString &command, QPushButton *but
connect
(
process
,
&
QProcess
::
errorOccurred
,
this
,
[
&
](
const
QProcess
::
ProcessError
&
error
){
processErrorOccured
(
error
,
terminal
,
button
);
});
terminal
->
log
(
"
\033
[3mPATH set to: "
+
QString
::
fromLocal8Bit
(
qgetenv
(
"PATH"
))
+
"
\033
[0m"
);
process
->
start
(
command
);
//execute the system command via QProcess
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
process
->
start
(
command
,
QIODevice
::
ReadOnly
);
//execute the system command via QProcess
#else
QStringList
args
(
QProcess
::
splitCommand
(
QStringView
(
command
)
)
);
const
QString
exe
(
args
[
0
]
);
args
.
removeAt
(
0
);
process
->
start
(
exe
,
args
,
QIODevice
::
ReadOnly
);
//execute the system command via QProcess
#endif
terminal
->
log
(
html
::
bold
(
"$ "
+
command
));
//show what is being run
topStatus
(
tr
(
"A process is running..."
),
"normal"
,
true
);
...
...
src/main/Error.cc
View file @
a05a7ca0
...
...
@@ -25,7 +25,7 @@
#include
<QMessageBox>
#include
<QTextStream>
#if QT_VERSION < QT_VERSION_CHECK(5, 1
4
, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 1
5
, 0)
namespace
Qt
{
static
auto
endl
=
::
endl
;
...
...
src/main/main.cc
View file @
a05a7ca0
...
...
@@ -46,7 +46,7 @@
#include
<iostream>
#if QT_VERSION < QT_VERSION_CHECK(5, 1
4
, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 1
5
, 0)
namespace
Qt
{
static
auto
SkipEmptyParts
=
QString
::
SkipEmptyParts
;
...
...
src/panels/Checklist.cc
View file @
a05a7ca0
...
...
@@ -26,7 +26,7 @@
#include
<QStringList>
#if QT_VERSION < QT_VERSION_CHECK(5, 1
4
, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 1
5
, 0)
namespace
Qt
{
static
auto
SkipEmptyParts
=
QString
::
SkipEmptyParts
;
...
...
src/panels/Choice.cc
View file @
a05a7ca0
...
...
@@ -25,7 +25,7 @@
#include
<QStringList>
#if QT_VERSION < QT_VERSION_CHECK(5, 1
4
, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 1
5
, 0)
namespace
Qt
{
static
auto
SkipEmptyParts
=
QString
::
SkipEmptyParts
;
...
...
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