diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:04:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:25:54 +0200 |
| commit | aed5a7168354c6ae47687d20b4bd3f0adcc14f8e (patch) | |
| tree | d2060479a7c12fdba8c1955e5d363754feffabb8 /qmake/project.cpp | |
| parent | d3d10cf23d61f4a011f1a7e9abdee1a92717e80f (diff) | |
| parent | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/gui/painting/qdrawhelper.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/testlib/qtestblacklist.cpp
src/tools/qdoc/node.cpp
src/tools/qdoc/node.h
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 445c5c9bc5..faea6da650 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -70,6 +70,7 @@ bool QMakeProject::read(const QString &project, LoadFlags what) QString absproj = (project == QLatin1String("-")) ? QLatin1String("(stdin)") : QDir::cleanPath(QDir(qmake_getpwd()).absoluteFilePath(project)); + m_projectDir = QFileInfo(absproj).path(); return boolRet(evaluateFile(absproj, QMakeHandler::EvalProjectFile, what)); } |