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
6fabd1b2
Commit
6fabd1b2
authored
Sep 29, 2010
by
Friedemann Kleint
Browse files
PathChooser: Fix Windows.
Reviewed-by:
Tobias Hunger
<
tobias.hunger@nokia.com
>
parent
588bc1f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/libs/utils/pathchooser.cpp
View file @
6fabd1b2
...
...
@@ -110,7 +110,9 @@ QString PathChooserPrivate::expandedPath(const QString &input) const
{
if
(
input
.
isEmpty
())
return
input
;
const
QString
path
=
QDir
::
fromNativeSeparators
(
m_environment
.
expandVariables
(
input
));
// Environment does \-expansion, too.
const
QString
nativeInput
=
QDir
::
fromNativeSeparators
(
input
);
const
QString
path
=
QDir
::
fromNativeSeparators
(
m_environment
.
expandVariables
(
nativeInput
));
if
(
path
.
isEmpty
())
return
path
;
...
...
@@ -289,8 +291,6 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
//: Selected path is not valid:
displayPath
=
tr
(
"<not valid>"
);
*
errorMessage
=
tr
(
"Full path: <b>%1</b>"
).
arg
(
QDir
::
toNativeSeparators
(
expandedPath
));
if
(
expandedPath
.
isEmpty
())
{
if
(
errorMessage
)
*
errorMessage
=
tr
(
"The path must not be empty."
);
...
...
@@ -350,7 +350,8 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
default:
;
}
if
(
errorMessage
)
*
errorMessage
=
tr
(
"Full path: <b>%1</b>"
).
arg
(
QDir
::
toNativeSeparators
(
expandedPath
));
return
true
;
}
...
...
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