Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
fd968191
Commit
fd968191
authored
Oct 07, 2010
by
Tobias Hunger
Browse files
Qt4: Use native pathes in qmake arguments
Use native pathes in qmake arguments.
parent
c8065c23
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qmakestep.cpp
View file @
fd968191
...
...
@@ -106,9 +106,9 @@ QStringList QMakeStep::allArguments()
Qt4BuildConfiguration
*
bc
=
qt4BuildConfiguration
();
QStringList
arguments
;
if
(
bc
->
subNodeBuild
())
arguments
<<
bc
->
subNodeBuild
()
->
path
();
arguments
<<
QDir
::
toNativeSeparators
(
bc
->
subNodeBuild
()
->
path
()
)
;
else
arguments
<<
buildConfiguration
()
->
target
()
->
project
()
->
file
()
->
fileName
();
arguments
<<
QDir
::
toNativeSeparators
(
buildConfiguration
()
->
target
()
->
project
()
->
file
()
->
fileName
()
)
;
arguments
<<
"-r"
;
if
(
!
additonalArguments
.
contains
(
"-spec"
))
...
...
@@ -153,6 +153,7 @@ QStringList QMakeStep::moreArguments()
<<
QLatin1String
(
"RCC_DIR=rcc"
);
}
// Do not turn debugger path into native path separators: Qmake does not like that!
arguments
<<
QLatin1String
(
Constants
::
QMAKEVAR_QMLJSDEBUGGER_PATH
)
+
QLatin1Char
(
'='
)
+
Core
::
ICore
::
instance
()
->
resourcePath
()
+
QLatin1String
(
"/qml/qmljsdebugger"
);
return
arguments
;
...
...
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