1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: Emit warning when regenerating Xcode project during build

Browse Source 
Makes it a bit more clear why all the Xcode settings were lost.

Task-number: QTBUG-45113
Change-Id: I3b19edb02a24673f56e77d3a1fb7cc76584c73fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-07-16 14:10:50 +02:00
parent 503920ac9e
commit f1243f6d44
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -542,6 +542,10 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
QTextStream mkt(&mkf); QTextStream mkt(&mkf);
writeHeader(mkt); writeHeader(mkt);
mkt << "QMAKE = " << var("QMAKE_QMAKE") << endl; mkt << "QMAKE = " << var("QMAKE_QMAKE") << endl;
project->values("QMAKE_MAKE_QMAKE_EXTRA_COMMANDS")
<< "@echo 'warning: Xcode project has been regenerated, custom settings have been lost. " \
"Use CONFIG+=no_autoqmake to prevent this behavior in the future, " \
"at the cost of requiring manual project change tracking.'";
writeMakeQmake(mkt); writeMakeQmake(mkt);
mkt.flush(); mkt.flush();
mkf.close(); mkf.close();

3
qmake/generators/makefile.cpp
View File

@ -2771,6 +2771,9 @@ MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll)
const ProStringList &included = escapeDependencyPaths(project->values("QMAKE_INTERNAL_INCLUDED_FILES")); const ProStringList &included = escapeDependencyPaths(project->values("QMAKE_INTERNAL_INCLUDED_FILES"));
t << included.join(QString(" \\\n\t\t")) << "\n\t" t << included.join(QString(" \\\n\t\t")) << "\n\t"
<< qmake << endl; << qmake << endl;
const ProStringList &extraCommands = project->values("QMAKE_MAKE_QMAKE_EXTRA_COMMANDS");
if (!extraCommands.isEmpty())
t << "\t" << extraCommands.join(QString("\n\t")) << endl;
for(int include = 0; include < included.size(); ++include) { for(int include = 0; include < included.size(); ++include) {
const ProString &i = included.at(include); const ProString &i = included.at(include);
if(!i.isEmpty()) if(!i.isEmpty())