Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flatpak-qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marco Bubke
flatpak-qt-creator
Commits
fd968191
Commit
fd968191
authored
14 years ago
by
Tobias Hunger
Browse files
Options
Downloads
Patches
Plain Diff
Qt4: Use native pathes in qmake arguments
Use native pathes in qmake arguments.
parent
c8065c23
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/plugins/qt4projectmanager/qmakestep.cpp
+3
-2
3 additions, 2 deletions
src/plugins/qt4projectmanager/qmakestep.cpp
with
3 additions
and
2 deletions
src/plugins/qt4projectmanager/qmakestep.cpp
+
3
−
2
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment