OSDN Git Service
(root)
/
qt-creator-jp
/
qt-creator-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d3cf2c5
)
Fix makefile location check for qmakestep
author
dt_
<qtc-committer@nokia.com>
Fri, 10 Jun 2011 14:43:05 +0000
(16:43 +0200)
committer
Daniel Teske
<daniel.teske@nokia.com>
Fri, 10 Jun 2011 14:51:44 +0000
(16:51 +0200)
Change-Id: Idf1842be4f8d7fe62b1569845b3f70ad1da32abd
Task-Nr: QTCREATORBUG-5127
Reviewed-on: http://codereview.qt.nokia.com/459
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
src/plugins/qt4projectmanager/qmakestep.cpp
patch
|
blob
|
history
diff --git
a/src/plugins/qt4projectmanager/qmakestep.cpp
b/src/plugins/qt4projectmanager/qmakestep.cpp
index
8f1c196
..
86a0f4e
100644
(file)
--- a/
src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/
src/plugins/qt4projectmanager/qmakestep.cpp
@@
-235,6
+235,7
@@
bool QMakeStep::init()
makefile.append("/Makefile");
}
} else if (!qt4bc->makefile().isEmpty()) {
+ makefile.append("/");
makefile.append(qt4bc->makefile());
} else {
makefile.append("/Makefile");