AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: cleanup DISTFILES

Browse Source 
Do not include the project file twice or other
.pr? files outside the project tree.

Task-number: QTBUG-21910
Change-Id: I62af842282ccdc5b9099d9227d5395ebe3f0698c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
J-P Nurmi 2013-12-09 21:46:05 +01:00 committed by The Qt Project
parent 328f2f9c35
commit 5c3faa52d7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/unix/unixmake.cpp
View File

@ -109,9 +109,11 @@ UnixMakefileGenerator::init()
project->values("VER_MIN").append(l[1]);
project->values("VER_PAT").append(l[2]);
project->values("DISTFILES") += project->projectFile();
if (!project->isEmpty("QMAKE_INTERNAL_INCLUDED_FILES"))
project->values("DISTFILES") += project->values("QMAKE_INTERNAL_INCLUDED_FILES");
QString sroot = project->sourceRoot();
foreach (const ProString &iif, project->values("QMAKE_INTERNAL_INCLUDED_FILES")) {
if (iif.startsWith(sroot) && iif.at(sroot.length()) == QLatin1Char('/'))
project->values("DISTFILES") += fileFixify(iif.toQString(), FileFixifyRelative);
}
/* this should probably not be here, but I'm using it to wrap the .t files */
if(project->first("TEMPLATE") == "app")

1
qmake/project.h
View File

@ -57,6 +57,7 @@ public:
bool read(const QString &project, LoadFlags what = LoadAll);
QString projectFile() const { return m_projectFile; }
QString sourceRoot() const { return m_sourceRoot.isEmpty() ? m_buildRoot : m_sourceRoot; }
QString buildRoot() const { return m_buildRoot; }
QString confFile() const { return m_conffile; }
QString cacheFile() const { return m_cachefile; }